From 4ffa3c5a9244578d3568e76e03baa596baa9115a Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 21 Mar 2017 11:03:02 +0300 Subject: [PATCH] Gradient Slider - refactoring. --- apps/common/main/lib/component/MultiSliderGradient.js | 10 +++++----- apps/common/main/lib/component/Slider.js | 8 ++------ apps/documenteditor/main/app/view/ShapeSettings.js | 8 ++++---- apps/documenteditor/main/app/view/TextArtSettings.js | 8 ++++---- apps/presentationeditor/main/app/view/ShapeSettings.js | 8 ++++---- apps/presentationeditor/main/app/view/SlideSettings.js | 8 ++++---- .../main/app/view/TextArtSettings.js | 8 ++++---- apps/spreadsheeteditor/main/app/view/ShapeSettings.js | 8 ++++---- .../spreadsheeteditor/main/app/view/TextArtSettings.js | 8 ++++---- 9 files changed, 35 insertions(+), 39 deletions(-) diff --git a/apps/common/main/lib/component/MultiSliderGradient.js b/apps/common/main/lib/component/MultiSliderGradient.js index bba8fde46..86290981b 100644 --- a/apps/common/main/lib/component/MultiSliderGradient.js +++ b/apps/common/main/lib/component/MultiSliderGradient.js @@ -153,13 +153,13 @@ define([ }, sortThumbs: function() { - var recalc_indexes = Common.UI.MultiSlider.prototype.sortThumbs.call(this); - var colors = [], + var recalc_indexes = Common.UI.MultiSlider.prototype.sortThumbs.call(this), + new_colors = [], me = this; - _.each (this.colorValues, function(color, index) { - colors[index] = me.colorValues[recalc_indexes[index]]; + _.each (recalc_indexes, function(recalc_index) { + new_colors.push(me.colorValues[recalc_index]); }); - this.colorValues = colors; + this.colorValues = new_colors; this.trigger('sortthumbs', me, recalc_indexes); return recalc_indexes; } diff --git a/apps/common/main/lib/component/Slider.js b/apps/common/main/lib/component/Slider.js index bdfe5ac3b..67a86d2d2 100644 --- a/apps/common/main/lib/component/Slider.js +++ b/apps/common/main/lib/component/Slider.js @@ -503,15 +503,11 @@ define([ sortThumbs: function() { this.thumbs.sort(function(a, b) { - if (a.position < b.position) - return -1; - if (a.position > b.position) - return 1; - return 0; + return (a.position - b.position); }); var recalc_indexes = []; _.each (this.thumbs, function(thumb, index) { - recalc_indexes[index] = thumb.index; + recalc_indexes.push(thumb.index); thumb.index = index; }); return recalc_indexes; diff --git a/apps/documenteditor/main/app/view/ShapeSettings.js b/apps/documenteditor/main/app/view/ShapeSettings.js index 326e1e2c6..d33dec7d0 100644 --- a/apps/documenteditor/main/app/view/ShapeSettings.js +++ b/apps/documenteditor/main/app/view/ShapeSettings.js @@ -1341,12 +1341,12 @@ define([ this.sldrGradient.on('thumbdblclick', function(cmp){ me.btnGradColor.cmpEl.find('button').dropdown('toggle'); }); - this.sldrGradient.on('sortthumbs', function(cmp, indexes){ + this.sldrGradient.on('sortthumbs', function(cmp, recalc_indexes){ var colors = [], currentIdx; - _.each (me.GradColor.colors, function(color, index) { - colors[index] = me.GradColor.colors[indexes[index]]; - if (me.GradColor.currentIdx == indexes[index]) + _.each (recalc_indexes, function(recalc_index, index) { + colors.push(me.GradColor.colors[recalc_index]); + if (me.GradColor.currentIdx == recalc_index) currentIdx = index; }); me.OriginalFillType = null; diff --git a/apps/documenteditor/main/app/view/TextArtSettings.js b/apps/documenteditor/main/app/view/TextArtSettings.js index c10773795..479909abb 100644 --- a/apps/documenteditor/main/app/view/TextArtSettings.js +++ b/apps/documenteditor/main/app/view/TextArtSettings.js @@ -916,12 +916,12 @@ define([ this.sldrGradient.on('thumbdblclick', function(cmp){ me.btnGradColor.cmpEl.find('button').dropdown('toggle'); }); - this.sldrGradient.on('sortthumbs', function(cmp, indexes){ + this.sldrGradient.on('sortthumbs', function(cmp, recalc_indexes){ var colors = [], currentIdx; - _.each (me.GradColor.colors, function(color, index) { - colors[index] = me.GradColor.colors[indexes[index]]; - if (me.GradColor.currentIdx == indexes[index]) + _.each (recalc_indexes, function(recalc_index, index) { + colors.push(me.GradColor.colors[recalc_index]); + if (me.GradColor.currentIdx == recalc_index) currentIdx = index; }); me.OriginalFillType = null; diff --git a/apps/presentationeditor/main/app/view/ShapeSettings.js b/apps/presentationeditor/main/app/view/ShapeSettings.js index 4fbefbef2..dadf43a91 100644 --- a/apps/presentationeditor/main/app/view/ShapeSettings.js +++ b/apps/presentationeditor/main/app/view/ShapeSettings.js @@ -1234,12 +1234,12 @@ define([ this.sldrGradient.on('thumbdblclick', function(cmp){ me.btnGradColor.cmpEl.find('button').dropdown('toggle'); }); - this.sldrGradient.on('sortthumbs', function(cmp, indexes){ + this.sldrGradient.on('sortthumbs', function(cmp, recalc_indexes){ var colors = [], currentIdx; - _.each (me.GradColor.colors, function(color, index) { - colors[index] = me.GradColor.colors[indexes[index]]; - if (me.GradColor.currentIdx == indexes[index]) + _.each (recalc_indexes, function(recalc_index, index) { + colors.push(me.GradColor.colors[recalc_index]); + if (me.GradColor.currentIdx == recalc_index) currentIdx = index; }); me.OriginalFillType = null; diff --git a/apps/presentationeditor/main/app/view/SlideSettings.js b/apps/presentationeditor/main/app/view/SlideSettings.js index dbb3975a8..0c8f54bf0 100644 --- a/apps/presentationeditor/main/app/view/SlideSettings.js +++ b/apps/presentationeditor/main/app/view/SlideSettings.js @@ -755,12 +755,12 @@ define([ this.sldrGradient.on('thumbdblclick', function(cmp){ me.btnGradColor.cmpEl.find('button').dropdown('toggle'); }); - this.sldrGradient.on('sortthumbs', function(cmp, indexes){ + this.sldrGradient.on('sortthumbs', function(cmp, recalc_indexes){ var colors = [], currentIdx; - _.each (me.GradColor.colors, function(color, index) { - colors[index] = me.GradColor.colors[indexes[index]]; - if (me.GradColor.currentIdx == indexes[index]) + _.each (recalc_indexes, function(recalc_index, index) { + colors.push(me.GradColor.colors[recalc_index]); + if (me.GradColor.currentIdx == recalc_index) currentIdx = index; }); me.OriginalFillType = null; diff --git a/apps/presentationeditor/main/app/view/TextArtSettings.js b/apps/presentationeditor/main/app/view/TextArtSettings.js index 084345427..a51b3d261 100644 --- a/apps/presentationeditor/main/app/view/TextArtSettings.js +++ b/apps/presentationeditor/main/app/view/TextArtSettings.js @@ -1224,12 +1224,12 @@ define([ this.sldrGradient.on('thumbdblclick', function(cmp){ me.btnGradColor.cmpEl.find('button').dropdown('toggle'); }); - this.sldrGradient.on('sortthumbs', function(cmp, indexes){ + this.sldrGradient.on('sortthumbs', function(cmp, recalc_indexes){ var colors = [], currentIdx; - _.each (me.GradColor.colors, function(color, index) { - colors[index] = me.GradColor.colors[indexes[index]]; - if (me.GradColor.currentIdx == indexes[index]) + _.each (recalc_indexes, function(recalc_index, index) { + colors.push(me.GradColor.colors[recalc_index]); + if (me.GradColor.currentIdx == recalc_index) currentIdx = index; }); me.OriginalFillType = null; diff --git a/apps/spreadsheeteditor/main/app/view/ShapeSettings.js b/apps/spreadsheeteditor/main/app/view/ShapeSettings.js index b296197eb..f11030b49 100644 --- a/apps/spreadsheeteditor/main/app/view/ShapeSettings.js +++ b/apps/spreadsheeteditor/main/app/view/ShapeSettings.js @@ -1258,12 +1258,12 @@ define([ this.sldrGradient.on('thumbdblclick', function(cmp){ me.btnGradColor.cmpEl.find('button').dropdown('toggle'); }); - this.sldrGradient.on('sortthumbs', function(cmp, indexes){ + this.sldrGradient.on('sortthumbs', function(cmp, recalc_indexes){ var colors = [], currentIdx; - _.each (me.GradColor.colors, function(color, index) { - colors[index] = me.GradColor.colors[indexes[index]]; - if (me.GradColor.currentIdx == indexes[index]) + _.each (recalc_indexes, function(recalc_index, index) { + colors.push(me.GradColor.colors[recalc_index]); + if (me.GradColor.currentIdx == recalc_index) currentIdx = index; }); me.OriginalFillType = null; diff --git a/apps/spreadsheeteditor/main/app/view/TextArtSettings.js b/apps/spreadsheeteditor/main/app/view/TextArtSettings.js index cef2d8b24..f31ebef90 100644 --- a/apps/spreadsheeteditor/main/app/view/TextArtSettings.js +++ b/apps/spreadsheeteditor/main/app/view/TextArtSettings.js @@ -1228,12 +1228,12 @@ define([ this.sldrGradient.on('thumbdblclick', function(cmp){ me.btnGradColor.cmpEl.find('button').dropdown('toggle'); }); - this.sldrGradient.on('sortthumbs', function(cmp, indexes){ + this.sldrGradient.on('sortthumbs', function(cmp, recalc_indexes){ var colors = [], currentIdx; - _.each (me.GradColor.colors, function(color, index) { - colors[index] = me.GradColor.colors[indexes[index]]; - if (me.GradColor.currentIdx == indexes[index]) + _.each (recalc_indexes, function(recalc_index, index) { + colors.push(me.GradColor.colors[recalc_index]); + if (me.GradColor.currentIdx == recalc_index) currentIdx = index; }); me.OriginalFillType = null;