From 9cafbb82c667f910ee4b8d7bb7be3d0f22916d0d Mon Sep 17 00:00:00 2001 From: Lombiq Date: Thu, 23 May 2019 17:55:22 +0200 Subject: [PATCH] Media Library: Code styling in media-library.js --- .../Scripts/media-library.js | 108 +++++++++--------- .../Views/Admin/Index.cshtml | 2 +- 2 files changed, 55 insertions(+), 55 deletions(-) diff --git a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Scripts/media-library.js b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Scripts/media-library.js index 956578248..2b52c65f9 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Scripts/media-library.js +++ b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Scripts/media-library.js @@ -1,15 +1,15 @@ -var enhanceViewModel = function(viewModel) { +var enhanceViewModel = function (viewModel) { // extension point for other modules to alter the view model }; -var baseViewModel = function() { +var baseViewModel = function () { }; $(function () { (function (settings) { - function attachFolderTitleDropEvent (elements) { + function attachFolderTitleDropEvent(elements) { elements.droppable({ accept: function () { var targetId = $(this).data('term-id'); @@ -105,7 +105,7 @@ $(function () { self.selected = ko.observable(); self.status = ko.observable(''); self.summary = ko.observable(''); - self.cssClass = ko.computed(function() { + self.cssClass = ko.computed(function () { var css = ''; if (self.selected()) { css += ' selected'; @@ -118,12 +118,12 @@ $(function () { return css; }); - self.publicationStatus = ko.computed(function() { + self.publicationStatus = ko.computed(function () { return self.data.published ? "" : draftText; }); // operations - self.setData = function(value) { + self.setData = function (value) { self.data = value; }; } @@ -171,7 +171,7 @@ $(function () { self.getMediaItems = function (count, append) { var folderPath = self.displayed() || ''; - + if (self.mediaPendingRequest()) { return; } @@ -188,12 +188,12 @@ $(function () { var url = self.loadMediaItemsUrl(folderPath, self.results().length, count, self.orderMedia(), self.mediaType()); console.log(url); - + $.ajax({ type: "GET", url: url, cache: false - }).done(function(data) { + }).done(function (data) { var mediaItems = data.mediaItems; var mediaItemsFolderPath = data.folderPath; @@ -214,9 +214,9 @@ $(function () { } } } - }).fail(function(data) { + }).fail(function (data) { console.error(data); - }).always(function() { + }).always(function () { self.pendingRequest(false); }); }; @@ -225,30 +225,30 @@ $(function () { self.results().forEach(function (item) { viewModel.toggleSelect(item, true); }); - } + }; - self.clearSelection = function() { + self.clearSelection = function () { this.focus(null); // unselect previous elements - self.selection().forEach(function(item) { + self.selection().forEach(function (item) { item.selected(false); }); self.selection([]); }; - self.focus.subscribe(function(oldValue) { + self.focus.subscribe(function (oldValue) { if (oldValue) { oldValue.hasFocus(false); } }, this, "beforeChange"); - self.afterRenderMediaFolderTemplate = function(elements, model) { + self.afterRenderMediaFolderTemplate = function (elements, model) { var childTitles = $(elements).find(".media-library-folder-title"); attachFolderTitleDropEvent(childTitles); }; - self.focus.subscribe(function(newValue) { + self.focus.subscribe(function (newValue) { if (newValue) { newValue.hasFocus(true); @@ -261,21 +261,21 @@ $(function () { type: "GET", url: url, cache: false - }).done(function(data) { + }).done(function (data) { newValue.summary(data); }); } } }); - self.displayFolder = function(folderPath) { + self.displayFolder = function (folderPath) { self.results([]); self.displayed(folderPath); self.loadMediaItemsUrl = function (f, skip, count, order, mediaType) { return settings.mediaItemsActionUrl + '?folderPath=' + encodeURIComponent(f) + '&skip=' + skip + '&count=' + count + '&order=' + order + '&mediaType=' + mediaType; }; - + self.getMediaItems(pageCount); }; @@ -284,22 +284,22 @@ $(function () { self.displayFolder(folderPath); }; - self.selectRecent = function() { + self.selectRecent = function () { History.pushState({ action: 'selectRecent' }, '', '?recent'); self.loadMediaItemsUrl = function (folderPath, skip, count, order, mediaType) { return settings.recentMediaItemsActionUrl + '?skip=' + skip + '&count=' + count + '&order=' + order + '&mediaType=' + mediaType; }; - + self.results([]); self.displayed(null); self.getMediaItems(pageCount); }; - self.toggleSelect = function(searchResult, force) { + self.toggleSelect = function (searchResult, force) { var index = $.inArray(searchResult, self.selection()); if (index == -1 || force) { - self.selection.remove(function(item) { return item.data.id == searchResult.data.id; }); + self.selection.remove(function (item) { return item.data.id == searchResult.data.id; }); self.selection.push(searchResult); searchResult.selected(true); } else { @@ -310,7 +310,7 @@ $(function () { this.focus(searchResult); }; - self.select = function(searchResult) { + self.select = function (searchResult) { var index = $.inArray(searchResult, self.selection()); if (index == -1) { self.clearSelection(); @@ -321,14 +321,14 @@ $(function () { this.focus(searchResult); }; - self.scrolled = function(data, event) { + self.scrolled = function (data, event) { var elem = event.target; if (elem.scrollTop > (elem.scrollHeight - elem.offsetHeight - 300)) { self.getMediaItems(pageCount, true); } }; - self.importMedia = function() { + self.importMedia = function () { var url = settings.importActionUrl + '?folderPath=' + encodeURIComponent(self.displayed()); window.location = url; }; @@ -372,13 +372,13 @@ $(function () { self.isExpanded = ko.observable(false); - self.isSelected = ko.computed(function() { + self.isSelected = ko.computed(function () { return (self.mediaIndexViewModel.displayed() == self.folderPath()); }); self.fetchChildren = function (deepestChildPath) { self.childFoldersFetchStatus = 1; - + var getChildFolderListUrl = function (f) { return settings.childFolderListingActionUrl + '?folderPath=' + encodeURIComponent(f); }; @@ -454,7 +454,7 @@ $(function () { }); enhanceViewModel(viewModel); - + ko.applyBindings(viewModel); if (settings.hasFolderPath && settings.folderPath != settings.rootFolderPath) { @@ -482,7 +482,7 @@ $(function () { History.pushState({ action: 'selectRecent' }, '', '?recent'); } - window.onpopstate = function(event) { + window.onpopstate = function (event) { if (event && event.state && event.state.action == 'displayFolder') { viewModel.displayFolder(event.state.folder); } @@ -492,7 +492,7 @@ $(function () { } }; - $("#media-library-main-list").on("mousedown", "li", function(e) { + $("#media-library-main-list").on("mousedown", "li", function (e) { // only for left click if (e.which != 1) { return; @@ -504,37 +504,37 @@ $(function () { } else { viewModel.select(searchResult); } - }).on("contextmenu", "li", function() { + }).on("contextmenu", "li", function () { var searchResult = ko.dataFor(this); viewModel.toggleSelect(searchResult); return false; }); var pickAndClose = function () { - if (parent.$.colorbox) { - var selectedData = []; - for (var i = 0; i < viewModel.selection().length; i++) { - var selection = viewModel.selection()[i]; - selectedData.push(selection.data); - } - parent.$.colorbox.selectedData = selectedData; - parent.$.colorbox.close(); - }; - } + if (parent.$.colorbox) { + var selectedData = []; + for (var i = 0; i < viewModel.selection().length; i++) { + var selection = viewModel.selection()[i]; + selectedData.push(selection.data); + } + parent.$.colorbox.selectedData = selectedData; + parent.$.colorbox.close(); + }; + }; $("#media-library-main-selection-select > .button-select").on('click', function () { - pickAndClose(); + pickAndClose(); }); - $("#media-library-toolbar > .button-select-all").on('click', function () { + $("#select-all-button").on('click', function () { viewModel.selectAll(); }); $("#media-library-main-list").on('dblclick', function () { - pickAndClose(); + pickAndClose(); }); - $("#media-library-main-selection-select > .button-cancel").on('click', function() { + $("#media-library-main-selection-select > .button-cancel").on('click', function () { if (parent.$.colorbox) { parent.$.colorbox.selectedData = null; parent.$.colorbox.close(); @@ -542,12 +542,12 @@ $(function () { ; }); - $("#media-library-main-list").on("mouseover", ".media-thumbnail", function() { + $("#media-library-main-list").on("mouseover", ".media-thumbnail", function () { if (!$(this).hasClass("ui-draggable")) { $(this).draggable({ revert: 'invalid', //containment: 'li', - helper: function(event) { + helper: function (event) { var clone = $(event.currentTarget).clone().removeAttr('id'); clone.removeClass('selected'); clone.addClass('dragged-selection'); @@ -562,7 +562,7 @@ $(function () { cursor: 'move', distance: 10, appendTo: 'body', - create: function() { + create: function () { // position the handler a little left to the center to let the number of selected items to appear $(this).draggable("option", "cursorAt", { left: $(this).width() / 2 - 20, top: $(this).height() / 2 }); } @@ -570,13 +570,13 @@ $(function () { } }); - $('#delete-selection-button').click(function() { + $('#delete-selection-button').click(function () { if (!confirm(settings.deleteConfirmationMessage)) { return false; } var ids = []; - viewModel.selection().forEach(function(item) { ids.push(item.data.id); }); + viewModel.selection().forEach(function (item) { ids.push(item.data.id); }); var url = settings.deleteActionUrl; $.ajax({ @@ -588,9 +588,9 @@ $(function () { mediaItemIds: ids, __RequestVerificationToken: settings.antiForgeryToken } - }).done(function(result) { + }).done(function (result) { if (result) { - viewModel.results.remove(function(item) { + viewModel.results.remove(function (item) { return ids.indexOf(item.data.id) != -1; }); diff --git a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/Admin/Index.cshtml b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/Admin/Index.cshtml index 655444113..5c85c1f42 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/Admin/Index.cshtml +++ b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/Admin/Index.cshtml @@ -22,7 +22,7 @@ @T("Create Folder") @Display(Model.CustomActionsShapes) - +