summaryrefslogtreecommitdiff
path: root/www/js/rivendell.rh.js
diff options
context:
space:
mode:
authorPeterTheOne <petertheone@gmail.com>2016-01-28 21:10:28 (GMT)
committerPeterTheOne <petertheone@gmail.com>2016-01-28 21:10:28 (GMT)
commit1ef5a5a1aac0e562c0b3b81c0cb7eb5997b02bd5 (patch)
tree10a36353a309bb356b4567f99c2bf6c625e68159 /www/js/rivendell.rh.js
parenta3d085734454a66955bcc2c642b0a4f7bf5d2b92 (diff)
musicpools: use Rivendell.Cart and Cut classes, make them xml ready
Diffstat (limited to 'www/js/rivendell.rh.js')
-rw-r--r--www/js/rivendell.rh.js18
1 files changed, 9 insertions, 9 deletions
diff --git a/www/js/rivendell.rh.js b/www/js/rivendell.rh.js
index dde1fda..5268cc1 100644
--- a/www/js/rivendell.rh.js
+++ b/www/js/rivendell.rh.js
@@ -88,10 +88,10 @@ Rivendell.GroupList.prototype.fetch = function(type, success) {
group = new JingleGroup(groupXml);
break;
case 'musicpool':
- group = new Musicpool(groupXml);
+ group = new Rivendell.Musicpool(groupXml);
break;
default:
- group = new Rivendell(groupXml);
+ group = new Rivendell.Group(groupXml);
break;
}
@@ -126,15 +126,15 @@ Rivendell.Musicgrid.prototype.fetch = function(success) {
};
Rivendell.MusicgridClock = function(name, color, title, dow, hour) {
- this.clockXml = null;
+ this.xml = null;
if (arguments.length === 1) {
- this.clockXml = name;
- this.name = $('name', this.clockXml).text();
- this.color = $('color', this.clockXml).text();
- this.title = $('title', this.clockXml).text();
- this.dow = $(this.clockXml).attr('dow');
- this.hour = $(this.clockXml).attr('hour');
+ this.xml = arguments[0];
+ this.name = $('name', this.xml).text();
+ this.color = $('color', this.xml).text();
+ this.title = $('title', this.xml).text();
+ this.dow = $(this.xml).attr('dow');
+ this.hour = $(this.xml).attr('hour');
} else {
this.name = name;
this.color = color;