Merge pull request #1319 from jeansouza/b4.0.0-release-candidate-3

fixing color picker version
TerraMA2 · Oct 24, 2017 · 807ec4d · 807ec4d
2 parents c214882 + 6b235e2
commit 807ec4d
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 7 deletions.
diff --git a/webapp/package.json b/webapp/package.json
@@ -76,7 +76,7 @@
     "fastclick": "=1.0.6",
     "ace-builds": "=1.2.8",
     "admin-lte": "=2.3.0",
-    "angularjs-color-picker": "=3.4.8",
+    "angularjs-color-picker": "=2.7.2",
     "angular-eonasdan-datetimepicker": "=0.3.9",
     "almond": "=0.3.3",
     "ui-select": "=0.19.8",

diff --git a/webapp/public/javascripts/angular/alerts/controllers/alert-register-update.js b/webapp/public/javascripts/angular/alerts/controllers/alert-register-update.js
@@ -764,7 +764,7 @@ define([], function() {
           };
           for (var i = 0; i < self.alert.legend.levels.length; i++){
             var colorModel = {
-              color: (self.colors[i].charAt(0) !== "#" ? "#" + self.colors[i] : self.colors[i]),
+              color: self.colors[i],
               isDefault: i == 0,
               title: self.alert.legend.levels[i].name,
               value: self.alert.legend.levels[i].value ? self.alert.legend.levels[i].value : ""

diff --git a/webapp/public/javascripts/angular/views/controllers/view-register-update.js b/webapp/public/javascripts/angular/views/controllers/view-register-update.js
@@ -461,11 +461,6 @@ define([], function() {
                 }
               }
             }
-
-            for(var i = 0; i < self.legend.colors.length; ++i) {
-              if(self.legend.colors[i].color.charAt(0) !== "#")
-                self.legend.colors[i].color = "#" + self.legend.colors[i].color;
-            }
           }
           else if (Object.keys(self.legend).length !== 0 && self.legend.metadata.creation_type != "editor" && self.legend.metadata.creation_type != "xml"){
             if (self.legend.fieldsToReplace){