From c3ea2480da7c5f76d73e245857b90180f6c2864a Mon Sep 17 00:00:00 2001 From: Lars Jung Date: Tue, 3 Sep 2013 17:59:10 +0200 Subject: [PATCH] Refactors. --- README.md | 1 + .../client/images/{select.svg => selected.svg} | 0 src/_h5ai/client/js/inc/ext/select.js | 17 +++++++++++------ src/_h5ai/client/js/inc/view/items.js | 4 ---- 4 files changed, 12 insertions(+), 10 deletions(-) rename src/_h5ai/client/images/{select.svg => selected.svg} (100%) diff --git a/README.md b/README.md index 583d5fba..d3318467 100644 --- a/README.md +++ b/README.md @@ -60,6 +60,7 @@ It profits from these great projects: * adds optional natural sort of items * adds optional checkboxes to select items * adds text preview modes: none, fixed, markdown +* optionally hide folders in main view * makes use of EXIF thumbnails optional * fixes file deletion of multiple files * fixes `setParentFolderLabels = false` diff --git a/src/_h5ai/client/images/select.svg b/src/_h5ai/client/images/selected.svg similarity index 100% rename from src/_h5ai/client/images/select.svg rename to src/_h5ai/client/images/selected.svg diff --git a/src/_h5ai/client/js/inc/ext/select.js b/src/_h5ai/client/js/inc/ext/select.js index 5bf66993..b1287a1d 100644 --- a/src/_h5ai/client/js/inc/ext/select.js +++ b/src/_h5ai/client/js/inc/ext/select.js @@ -6,6 +6,8 @@ modulejs.define('ext/select', ['_', '$', 'core/settings', 'core/resource', 'core checkboxes: false }, allsettings.select), + template = 'selected', + x = 0, y = 0, l = 0, t = 0, w = 0, h = 0, shrink = 1/3, @@ -115,14 +117,17 @@ modulejs.define('ext/select', ['_', '$', 'core/settings', 'core/resource', 'core initItem = function (item) { if (item.$view) { - item.$view.find('.selector').on('click', function (event) { - event.stopImmediatePropagation(); - event.preventDefault(); + $(template) + .appendTo(item.$view.find('a')) + .on('click', function (event) { - item.$view.toggleClass('selected'); - publish(); - }); + event.stopImmediatePropagation(); + event.preventDefault(); + + item.$view.toggleClass('selected'); + publish(); + }); } }, diff --git a/src/_h5ai/client/js/inc/view/items.js b/src/_h5ai/client/js/inc/view/items.js index 5334516a..58008e33 100644 --- a/src/_h5ai/client/js/inc/view/items.js +++ b/src/_h5ai/client/js/inc/view/items.js @@ -15,9 +15,6 @@ modulejs.define('view/items', ['_', '$', 'core/settings', 'core/resource', 'core '' + '' + '' + - '' + - 'selected' + - '' + '' + '', hintTemplate = '', @@ -75,7 +72,6 @@ modulejs.define('view/items', ['_', '$', 'core/settings', 'core/resource', 'core $label.addClass('l10n-parentDirectory'); } $html.addClass('folder-parent'); - $html.find('.selector').remove(); } if (item.$view) {