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

only use current search if its inside a layer

Browse source
This commit is contained in:
j 2019-11-01 15:22:53 +01:00
parent ae2e3e45c6
commit 85095eda44
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
static/js/editor.js
View file

@ -28,7 +28,7 @@ pandora.ui.editor = function(data) {
enableSetPosterFrame: !pandora.site.media.importFrames && data.editable, enableSetPosterFrame: !pandora.site.media.importFrames && data.editable,
enableSubtitles: ui.videoSubtitles, enableSubtitles: ui.videoSubtitles,
find: ui.itemFind, find: ui.itemFind,
findLayer: ui._findState.key, findLayer: pandora.getFindLayer(),
getFrameURL: function(position) { getFrameURL: function(position) {
return pandora.getMediaURL('/' + ui.item + '/' + ui.videoResolution + 'p' + position + '.jpg?' + data.modified); return pandora.getMediaURL('/' + ui.item + '/' + ui.videoResolution + 'p' + position + '.jpg?' + data.modified);
}, },

8
static/js/utils.js
View file

@ -1439,6 +1439,14 @@ pandora.getFoldersWidth = function(section) {
return width; return width;
}; };
pandora.getFindLayer = function() {
var key = pandora.user.ui._findState.key
if (!!Ox.getObjectById(pandora.site.layers, key)) {
key = 'all'
}
return key
};
pandora.getHash = function(state, callback) { pandora.getHash = function(state, callback) {
// FIXME: remove this // FIXME: remove this
var embedKeys = [ var embedKeys = [