0x2620/pandora
2
1
Fork 1
Code Issues 1.3k Pull requests Releases Wiki Activity

move message handling from embedPanel.js to pandora.js

Browse source
This commit is contained in:
rolux 2013-02-25 13:44:13 +05:30
parent 2f56c03281
commit 2c58f8f15e
2 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
static/js/pandora.js
View file

@ -314,6 +314,19 @@ appPanel
Ox.Theme(pandora.user.ui.theme); Ox.Theme(pandora.user.ui.theme);
if (isEmbed) { if (isEmbed) {
pandora.$ui.embedPanel = pandora.ui.embedPanel().display(); pandora.$ui.embedPanel = pandora.ui.embedPanel().display();
Ox.$parent.onMessage({
settheme: function(data) {
if (Ox.contains(pandora.site.themes, data.theme)) {
Ox.Theme(data.theme);
}
},
seturl: function(data) {
Ox.print('SET URL', data.url);
if (pandora.isEmbedURL(data.url)) {
pandora.URL.push(data.url);
}
}
});
} else { } else {
pandora.$ui.appPanel = pandora.ui.appPanel().display(); pandora.$ui.appPanel = pandora.ui.appPanel().display();
Ox.Request.requests() && pandora.$ui.loadingIcon.start(); Ox.Request.requests() && pandora.$ui.loadingIcon.start();

13
static/js/pandora/embedPanel.js
View file

@ -391,18 +391,7 @@ pandora.ui.embedPanel = function() {
pandora_hash: that.reloadPanel pandora_hash: that.reloadPanel
}); });
Ox.$parent.onMessage({ Ox.$parent.postMessage('loaded');
settheme: function(data) {
if (Ox.contains(pandora.site.themes, data.theme)) {
Ox.Theme(data.theme);
}
},
seturl: function(data) {
if (pandora.isEmbedURL(data.url)) {
pandora.URL.push(data.url);
}
}
});
return that; return that;