From b97ce2586744f36cce722f8e5a4241e54ac22e5d Mon Sep 17 00:00:00 2001 From: rolux Date: Sun, 3 Mar 2013 11:15:28 +0000 Subject: [PATCH] user.ui.updateAdvancedFind -> user.ui.updateAdvancedFindResults --- pandora/config.0xdb.jsonc | 2 +- pandora/config.indiancinema.jsonc | 3 ++- pandora/config.padma.jsonc | 2 +- pandora/config.pandora.jsonc | 2 +- static/js/pandora/filterDialog.js | 6 +++--- static/js/pandora/filterForm.js | 4 ++-- static/js/pandora/listDialog.js | 8 ++++---- 7 files changed, 14 insertions(+), 13 deletions(-) diff --git a/pandora/config.0xdb.jsonc b/pandora/config.0xdb.jsonc index cd50a7ef6..681e59eb1 100644 --- a/pandora/config.0xdb.jsonc +++ b/pandora/config.0xdb.jsonc @@ -778,7 +778,7 @@ "sidebarSize": 256, "textPositions": {}, "theme": "oxdark", - "updateAdvancedFind": false, + "updateAdvancedFindResults": false, "videoMuted": false, "videoPoints": {}, "videoResolution": 96, diff --git a/pandora/config.indiancinema.jsonc b/pandora/config.indiancinema.jsonc index 39b15bc4b..435093e3e 100644 --- a/pandora/config.indiancinema.jsonc +++ b/pandora/config.indiancinema.jsonc @@ -3,6 +3,7 @@ You can edit this file. */ + { "additionalSort": [ {"key": "director", "operator": "+"}, @@ -796,7 +797,7 @@ "sidebarSize": 256, "textPositions": {}, "theme": "oxmedium", - "updateAdvancedFind": false, + "updateAdvancedFindResults": false, "videoMuted": false, "videoPoints": {}, "videoResolution": 240, diff --git a/pandora/config.padma.jsonc b/pandora/config.padma.jsonc index ad1c5eed4..6319f2255 100644 --- a/pandora/config.padma.jsonc +++ b/pandora/config.padma.jsonc @@ -700,7 +700,7 @@ "sidebarSize": 256, "textPositions": {}, "theme": "oxlight", - "updateAdvancedFind": false, + "updateAdvancedFindResults": false, "videoMuted": false, "videoPoints": {}, "videoResolution": 240, diff --git a/pandora/config.pandora.jsonc b/pandora/config.pandora.jsonc index f6773deac..619a74f83 100644 --- a/pandora/config.pandora.jsonc +++ b/pandora/config.pandora.jsonc @@ -618,7 +618,7 @@ "showTimeline": true, "sidebarSize": 256, "theme": "oxmedium", - "updateAdvancedFind": false, + "updateAdvancedFindResults": false, "videoMuted": false, "videoPoints": {}, "videoResolution": 240, diff --git a/static/js/pandora/filterDialog.js b/static/js/pandora/filterDialog.js index cc4514f53..0e64fff99 100644 --- a/static/js/pandora/filterDialog.js +++ b/static/js/pandora/filterDialog.js @@ -35,7 +35,7 @@ pandora.ui.filterDialog = function(list) { }) .reloadList(); }); - } else if (!pandora.user.ui.updateAdvancedFind) { + } else if (!pandora.user.ui.updateAdvancedFindResults) { pandora.$ui.filterForm.updateResults(); } that.close(); @@ -55,12 +55,12 @@ pandora.ui.filterDialog = function(list) { $updateCheckbox = Ox.Checkbox({ title: 'Update Results in the Background', - value: pandora.user.ui.updateAdvancedFind + value: pandora.user.ui.updateAdvancedFindResults }) .css({float: 'left', margin: '4px'}) .bindEvent({ change: function(data) { - pandora.UI.set({updateAdvancedFind: data.value}); + pandora.UI.set({updateAdvancedFindResults: data.value}); data.value && pandora.$ui.filterForm.updateResults(); } }); diff --git a/static/js/pandora/filterForm.js b/static/js/pandora/filterForm.js index 872ea173f..e95da0033 100644 --- a/static/js/pandora/filterForm.js +++ b/static/js/pandora/filterForm.js @@ -45,11 +45,11 @@ pandora.ui.filterForm = function(list) { id: list.id, query: data.query }, function(result) { - if (pandora.user.ui.updateAdvancedFind) { + if (pandora.user.ui.updateAdvancedFindResults) { that.updateResults(data.query); } }); - } else if (pandora.user.ui.updateAdvancedFind) { + } else if (pandora.user.ui.updateAdvancedFindResults) { that.updateResults(); } that.triggerEvent('change', data); diff --git a/static/js/pandora/listDialog.js b/static/js/pandora/listDialog.js index 878a61cde..c8b1bb779 100644 --- a/static/js/pandora/listDialog.js +++ b/static/js/pandora/listDialog.js @@ -49,7 +49,7 @@ pandora.ui.listDialog = function(section) { if ( pandora.user.ui.section == 'items' && data.selected != 'query' - && !pandora.user.ui.updateAdvancedFind + && !pandora.user.ui.updateAdvancedFindResults ) { pandora.$ui.filterForm.updateResults(); } @@ -107,7 +107,7 @@ pandora.ui.listDialog = function(section) { click: function() { if ( pandora.$ui.listDialogTabPanel.selected() == 'query' - && !pandora.user.ui.updateAdvancedFind + && !pandora.user.ui.updateAdvancedFindResults ) { pandora.$ui.filterForm.updateResults(); } @@ -129,13 +129,13 @@ pandora.ui.listDialog = function(section) { $updateCheckbox = Ox.Checkbox({ title: 'Update Results in the Background', - value: pandora.user.ui.updateAdvancedFind + value: pandora.user.ui.updateAdvancedFindResults }) .css({float: 'left', margin: '4px'}) [section == 'query' ? 'show' : 'hide']() .bindEvent({ change: function(data) { - pandora.UI.set({updateAdvancedFind: data.value}); + pandora.UI.set({updateAdvancedFindResults: data.value}); data.value && pandora.$ui.filterForm.updateResults(); } });