merge
This commit is contained in:
commit
bed9f39909
2 changed files with 11 additions and 1 deletions
|
@ -221,7 +221,9 @@ appPanel
|
||||||
.on({
|
.on({
|
||||||
beforeunload: pandora.beforeunloadWindow,
|
beforeunload: pandora.beforeunloadWindow,
|
||||||
resize: function() {
|
resize: function() {
|
||||||
pandora.resizeWindow();
|
if (!isEmbed) {
|
||||||
|
pandora.resizeWindow();
|
||||||
|
}
|
||||||
},
|
},
|
||||||
unload: pandora.unloadWindow
|
unload: pandora.unloadWindow
|
||||||
})
|
})
|
||||||
|
|
|
@ -112,6 +112,14 @@ pandora.ui.embedPanel = function() {
|
||||||
fullscreen: function(data) {
|
fullscreen: function(data) {
|
||||||
Ox.Fullscreen.toggle();
|
Ox.Fullscreen.toggle();
|
||||||
},
|
},
|
||||||
|
open: function() {
|
||||||
|
$player.options({paused: true});
|
||||||
|
var url = document.location.protocol + '//'
|
||||||
|
+ document.location.hostname + '/'
|
||||||
|
+ options.item + '/'
|
||||||
|
+ Ox.formatDuration($player.options('position'));
|
||||||
|
window.open(url, '_blank');
|
||||||
|
},
|
||||||
playing: function(data) {
|
playing: function(data) {
|
||||||
setPosition(data.position, true);
|
setPosition(data.position, true);
|
||||||
},
|
},
|
||||||
|
|
Loading…
Reference in a new issue