--- /Users/dzuelke/SqueezeBox.js	2007-09-06 13:11:40.000000000 +0200
+++ squeezebox.js 2007-09-06 13:12:32.000000000 +0200
@@ -95,7 +95,7 @@
fromElement: function(el, options) {
this.initialize();
this.element = $(el);
- this.setOptions($merge(this.presets, options || {}, (this.element && this.element.rel) ? Json.evaluate(this.element.rel) : {}));
+ this.setOptions($merge(this.presets, options || {}, (this.element && this.element.rel) ? Json.decode(this.element.rel) : {}));
this.assignOptions();
this.url = ((this.element) ? (this.options.url || this.element.getProperty('href')) : el) || '';
if (this.options.handler) {
@@ -168,7 +168,7 @@
},

resize: function(size, instantly) {
- var sizes = window.getSize();
+ var sizes = Client.getSize();
this.size = $merge(this.isLoading ? this.options.sizeLoading : this.options.size, size);
var to = {
width: this.size.x, height: this.size.y,
@@ -225,7 +225,7 @@
},

reposition: function(sizes) {
- sizes = sizes || window.getSize();
+ sizes = sizes || Client.getSize();
this.overlay.setStyles({
left: sizes.scroll.x, top: sizes.scroll.y,
width: sizes.size.x, height: sizes.size.y
@@ -275,7 +275,7 @@
this.onError.delay(10, this);
return;
}
- var win = {x: window.getWidth() - this.options.marginImage.x, y: window.getHeight() - this.options.marginImage.y};
+ var win = {x: Client.getWidth() - this.options.marginImage.x, y: Client.getHeight() - this.options.marginImage.y};
size = {x: tmp.width, y: tmp.height};
for (var i = 2; i--;) {
if (size.x > win.x) {