From cb3c18e26ba17a5f3ef837ae29e549d9053dc654 Mon Sep 17 00:00:00 2001 From: j Date: Mon, 17 Apr 2017 19:31:53 +0200 Subject: [PATCH] use ui.clipSize --- pandora/config.0xdb.jsonc | 2 +- pandora/config.indiancinema.jsonc | 2 +- pandora/config.padma.jsonc | 2 +- pandora/config.pandora.jsonc | 2 +- static/js/editPanel.js | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pandora/config.0xdb.jsonc b/pandora/config.0xdb.jsonc index 38299b3c0..5606e7cfb 100644 --- a/pandora/config.0xdb.jsonc +++ b/pandora/config.0xdb.jsonc @@ -1201,6 +1201,7 @@ "calendarFind": "", "calendarSelection": "", "clipColumns": 2, + "clipSize": 416, "collectionColumns": ["title", "id", "extension", "dimensions", "size", "description", "matches", "user", "created", "modified"], "collectionColumnWidth": {}, "collectionSelection": [], @@ -1226,7 +1227,6 @@ "edit": "", "edits": {}, "editSelection": [], - "editSidebarSize": 416, "editSort": [ {"key": "index", "operator": "+"}, {"key": "year", "operator": "+"}, diff --git a/pandora/config.indiancinema.jsonc b/pandora/config.indiancinema.jsonc index 8e4c47a4d..f1716ae13 100644 --- a/pandora/config.indiancinema.jsonc +++ b/pandora/config.indiancinema.jsonc @@ -1673,6 +1673,7 @@ "calendarFind": "", "calendarSelection": "", "clipColumns": 2, + "clipSize": 416, "collectionColumns": ["title", "id", "extension", "dimensions", "size", "description", "matches", "user", "created", "modified"], "collectionColumnWidth": {}, "collectionSelection": [], @@ -1697,7 +1698,6 @@ "edit": "", "edits": {}, "editSelection": [], - "editSidebarSize": 416, "editSort": [ {"key": "index", "operator": "+"}, {"key": "year", "operator": "+"}, diff --git a/pandora/config.padma.jsonc b/pandora/config.padma.jsonc index e7e52b634..b3f47a1a2 100644 --- a/pandora/config.padma.jsonc +++ b/pandora/config.padma.jsonc @@ -1152,6 +1152,7 @@ "calendarFind": "", "calendarSelection": "", "clipColumns": 2, + "clipSize": 416, "collectionColumns": ["title", "id", "extension", "dimensions", "size", "description", "matches", "user", "created", "modified"], "collectionColumnWidth": {}, "collectionSelection": [], @@ -1177,7 +1178,6 @@ "edit": "", "edits": {}, "editSelection": [], - "editSidebarSize": 416, "editSort": [ {"key": "index", "operator": "+"}, {"key": "director", "operator": "+"}, diff --git a/pandora/config.pandora.jsonc b/pandora/config.pandora.jsonc index a96d91ac9..667622bfa 100644 --- a/pandora/config.pandora.jsonc +++ b/pandora/config.pandora.jsonc @@ -1092,6 +1092,7 @@ examples (config.SITENAME.jsonc) that are part of this pan.do/ra distribution. "calendarFind": "", "calendarSelection": "", "clipColumns": 2, + "clipSize": 416, "collectionColumns": ["title", "id", "extension", "dimensions", "size", "description", "matches", "user", "created", "modified"], "collectionColumnWidth": {}, "collectionSelection": [], @@ -1117,7 +1118,6 @@ examples (config.SITENAME.jsonc) that are part of this pan.do/ra distribution. "edit": "", "edits": {}, "editSelection": [], - "editSidebarSize": 416, "editSort": [ {"key": "index", "operator": "+"}, {"key": "year", "operator": "+"}, diff --git a/static/js/editPanel.js b/static/js/editPanel.js index 86576b6a9..fc602a702 100644 --- a/static/js/editPanel.js +++ b/static/js/editPanel.js @@ -81,7 +81,7 @@ pandora.ui.editPanel = function(isEmbed) { clickLink: pandora.clickLink, clipRatio: pandora.site.video.previewRatio, clips: Ox.clone(edit.clips), - clipSize: ui.editSidebarSize + Ox.UI.SCROLLBAR_SIZE, + clipSize: ui.clipSize + Ox.UI.SCROLLBAR_SIZE, clipTooltip: 'clips ' + Ox.SYMBOLS.shift + 'C', clipView: ui.edits[ui.edit].view, controlsTooltips: {