From 70859e93412e9b797aeda59d4ac590ba3572a13b Mon Sep 17 00:00:00 2001 From: "Alex A. Naanou" Date: Mon, 20 Jun 2016 23:30:46 +0300 Subject: [PATCH] some cleanup... Signed-off-by: Alex A. Naanou --- ui (gen4)/imagegrid/ribbons.js | 49 ++++++++++++++++++++-------------- 1 file changed, 29 insertions(+), 20 deletions(-) diff --git a/ui (gen4)/imagegrid/ribbons.js b/ui (gen4)/imagegrid/ribbons.js index a993383d..49edab22 100755 --- a/ui (gen4)/imagegrid/ribbons.js +++ b/ui (gen4)/imagegrid/ribbons.js @@ -37,7 +37,6 @@ var RIBBON = '.ribbon:not(.clone)' // Unpopulated: // //
-//
//
// // @@ -52,10 +51,16 @@ var RIBBON = '.ribbon:not(.clone)' // //
//
+// +// //
+// +// //
//
+// //
+// // ... //
// ... @@ -366,12 +371,13 @@ var RibbonsPrototype = { t.getAttribute('__prevent_transitions', 0) target.addClass('no-transitions') - getComputedStyle(t).webkitTransition - getComputedStyle(t).mozTransition - getComputedStyle(t).msTransition - getComputedStyle(t).oTransition - getComputedStyle(t).transition + var s = getComputedStyle(t) + s.webkitTransition + s.mozTransition + s.msTransition + s.oTransition + s.transition return this }, @@ -427,6 +433,7 @@ var RibbonsPrototype = { t.removeAttribute('__prevent_transitions') target.removeClass('no-transitions') + var s = getComputedStyle(t) s.webkitTransition s.mozTransition @@ -447,6 +454,7 @@ var RibbonsPrototype = { t.removeAttribute('__prevent_transitions') target.removeClass('no-transitions') + var s = getComputedStyle(t) s.webkitTransition s.mozTransition @@ -1314,6 +1322,18 @@ var RibbonsPrototype = { // Loading and updating... + // Replace image gid... + // + // XXX should this work for ribbon gids??? + replaceGid: function(from, to){ + var img = this.getImage(from) + + img && img.length > 0 + && this.setElemGID(img, to) + + return this + }, + // XXX is .__image_updaters the right way to go??? updateImageIndicators: function(gid, image){ gid = gid == null ? this.getElemGID() : gid @@ -1331,6 +1351,7 @@ var RibbonsPrototype = { return image }, + _loadImagePreviewURL: function(image, url){ url = util.path2url(url) // pre-cache and load image... @@ -1348,18 +1369,6 @@ var RibbonsPrototype = { return img }, - // Replace image gid... - // - // XXX should this work for ribbon gids??? - replaceGid: function(from, to){ - var img = this.getImage(from) - - img && img.length > 0 - && this.setElemGID(img, to) - - return this - }, - // Update image(s)... // // Update current image: @@ -1496,7 +1505,7 @@ var RibbonsPrototype = { })) }, - // Update a set of images in a ribbon... + // Update ribbon content... // // This will reuse the images that already exist, thus if updating or // adding images to an already loaded set this should be very fast. @@ -1796,7 +1805,7 @@ var RibbonsPrototype = { return this }, - // Update a data object in ribbons... + // Update the data in ribbons... // // .updateData(data, settings) // -> ribbons