Merge branch 'obres'

src/js/leaflet.storage.controls.js

@@ -862,7 +862,7 @@ L.Storage.Search = L.PhotonSearch.extend({
     },
 
     zoomToFeature: function (feature) {
-        var zoom = Math.max(this.map.getZoom(), 16);  // Never unzoom.
+        var zoom = Math.max(this.map.getZoom(), 18);  // Never unzoom.
         this.map.setView([feature.geometry.coordinates[1], feature.geometry.coordinates[0]], zoom);
     },
 

src/js/leaflet.storage.forms.js

@@ -85,37 +85,37 @@ L.FormBuilder.CheckBox.include({
 L.FormBuilder.ColorPicker = L.FormBuilder.Input.extend({
 
     colors: [
-        'Black', 'Navy', 'DarkBlue', 'MediumBlue', 'Blue', 'DarkGreen',
-        'Green', 'Teal', 'DarkCyan', 'DeepSkyBlue', 'DarkTurquoise',
-        'MediumSpringGreen', 'Lime', 'SpringGreen', 'Aqua', 'Cyan',
-        'MidnightBlue', 'DodgerBlue', 'LightSeaGreen', 'ForestGreen',
-        'SeaGreen', 'DarkSlateGray', 'DarkSlateGrey', 'LimeGreen',
-        'MediumSeaGreen', 'Turquoise', 'RoyalBlue', 'SteelBlue',
-        'DarkSlateBlue', 'MediumTurquoise', 'Indigo', 'DarkOliveGreen',
-        'CadetBlue', 'CornflowerBlue', 'MediumAquaMarine', 'DimGray',
-        'DimGrey', 'SlateBlue', 'OliveDrab', 'SlateGray', 'SlateGrey',
-        'LightSlateGray', 'LightSlateGrey', 'MediumSlateBlue', 'LawnGreen',
-        'Chartreuse', 'Aquamarine', 'Maroon', 'Purple', 'Olive', 'Gray',
-        'Grey', 'SkyBlue', 'LightSkyBlue', 'BlueViolet', 'DarkRed',
-        'DarkMagenta', 'SaddleBrown', 'DarkSeaGreen', 'LightGreen',
-        'MediumPurple', 'DarkViolet', 'PaleGreen', 'DarkOrchid',
-        'YellowGreen', 'Sienna', 'Brown', 'DarkGray', 'DarkGrey',
-        'LightBlue', 'GreenYellow', 'PaleTurquoise', 'LightSteelBlue',
-        'PowderBlue', 'FireBrick', 'DarkGoldenRod', 'MediumOrchid',
-        'RosyBrown', 'DarkKhaki', 'Silver', 'MediumVioletRed', 'IndianRed',
-        'Peru', 'Chocolate', 'Tan', 'LightGray', 'LightGrey', 'Thistle',
-        'Orchid', 'GoldenRod', 'PaleVioletRed', 'Crimson', 'Gainsboro',
-        'Plum', 'BurlyWood', 'LightCyan', 'Lavender', 'DarkSalmon',
-        'Violet', 'PaleGoldenRod', 'LightCoral', 'Khaki', 'AliceBlue',
-        'HoneyDew', 'Azure', 'SandyBrown', 'Wheat', 'Beige', 'WhiteSmoke',
-        'MintCream', 'GhostWhite', 'Salmon', 'AntiqueWhite', 'Linen',
-        'LightGoldenRodYellow', 'OldLace', 'Red', 'Fuchsia', 'Magenta',
-        'DeepPink', 'OrangeRed', 'Tomato', 'HotPink', 'Coral', 'DarkOrange',
-        'LightSalmon', 'Orange', 'LightPink', 'Pink', 'Gold', 'PeachPuff',
-        'NavajoWhite', 'Moccasin', 'Bisque', 'MistyRose', 'BlanchedAlmond',
-        'PapayaWhip', 'LavenderBlush', 'SeaShell', 'Cornsilk',
-        'LemonChiffon', 'FloralWhite', 'Snow', 'Yellow', 'LightYellow',
-        'Ivory', 'White'
+        //'Black', 'Navy', 'DarkBlue', 'MediumBlue', 'Blue', 'DarkGreen',
+        //'green', 'Teal', 'DarkCyan', 'DeepSkyBlue', 'DarkTurquoise',
+       'SpringGreen', //'mediumSpringGreen', 'Lime', 'Aqua', 'Cyan',
+        //'midnightBlue', 'DodgerBlue', 'LightSeaGreen', 'ForestGreen',
+        //'seaGreen', 'DarkSlateGray', 'DarkSlateGrey', 'LimeGreen',
+        //'mediumSeaGreen', 'Turquoise', 'RoyalBlue', 'SteelBlue',
+        //'darkSlateBlue', 'MediumTurquoise', 'Indigo', 'DarkOliveGreen',
+        //'cadetBlue', 'CornflowerBlue', 'MediumAquaMarine', 'DimGray',
+        //'dimGrey', 'SlateBlue', 'OliveDrab', 'SlateGray', 'SlateGrey',
+        //'lightSlateGray', 'LightSlateGrey', 'MediumSlateBlue', 'LawnGreen',
+        //'chartreuse', 'Aquamarine', 'Maroon', 'Purple', 'Olive', 'Gray',
+        //'grey', 'SkyBlue', 'LightSkyBlue', 'BlueViolet', 'DarkRed',
+        //'darkMagenta', 'SaddleBrown', 'DarkSeaGreen', 'LightGreen',
+        //'mediumPurple', 'DarkViolet', 'PaleGreen', 'DarkOrchid',
+        //'yellowGreen', 'Sienna', 'Brown', 'DarkGray', 'DarkGrey',
+        //'lightBlue', 'GreenYellow', 'PaleTurquoise', 'LightSteelBlue',
+        //'powderBlue', 'FireBrick', 'DarkGoldenRod', 'MediumOrchid',
+        //'rosyBrown', 'DarkKhaki', 'Silver', 'MediumVioletRed', 'IndianRed',
+        //'peru', 'Chocolate', 'Tan', 'LightGray', 'LightGrey', 'Thistle',
+        'orchid',//, 'GoldenRod', 'PaleVioletRed', 'Crimson', 'Gainsboro',
+        //'plum', 'BurlyWood', 'LightCyan', 'Lavender', 'DarkSalmon',
+        //'violet', 'PaleGoldenRod', 'LightCoral', 'Khaki', 'AliceBlue',
+        //'honeyDew', 'Azure', 'SandyBrown', 'Wheat', 'Beige', 'WhiteSmoke',
+        //'mintCream', 'GhostWhite', 'Salmon', 'AntiqueWhite', 'Linen',
+        'Red'//'lightGoldenRodYellow', 'OldLace', 'Red', 'Fuchsia', 'Magenta',
+        //'deepPink', 'OrangeRed', 'Tomato', 'HotPink', 'Coral', 'DarkOrange',
+        //'lightSalmon', 'Orange', 'LightPink', 'Pink', 'Gold', 'PeachPuff',
+        //'navajoWhite', 'Moccasin', 'Bisque', 'MistyRose', 'BlanchedAlmond',
+        //'papayaWhip', 'LavenderBlush', 'SeaShell', 'Cornsilk',
+        //'lemonChiffon', 'FloralWhite', 'Snow', 'Yellow', 'LightYellow',
+        //'Ivory', 'White'
     ],
 
     getParentNode: function () {