Merge branch 'master' of http://cloud.finedevelop.com:2015/scm/visual/fineui

# Conflicts:
#	dist/bundle.min.js
#	dist/fineui.min.js
#	dist/utils.min.js

dist/base.js

@@ -8793,7 +8793,7 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
                 },
                 left: 0,
                 right: 3,
-                top: 0,
+                top: 6,
                 bottom: 5
             }]
         });

dist/bundle.js

@@ -15944,7 +15944,12 @@ BI.ShowAction = BI.inherit(BI.Action, {
         BI.specialCharsMap = BI.specialCharsMap || {};
         url = url || "";
         url = url.replaceAll(BI.keys(BI.specialCharsMap || []).join("|"), function (str) {
+            switch (str) {
+                case "\\":
+                    return BI.specialCharsMap["\\\\"] || str;
+                default:
                     return BI.specialCharsMap[str] || str;
+            }
         });
         return _global.encodeURIComponent(url);
     };
@@ -44046,7 +44051,7 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
                 },
                 left: 0,
                 right: 3,
-                top: 0,
+                top: 6,
                 bottom: 5
             }]
         });

dist/core.js

@@ -15944,7 +15944,12 @@ BI.ShowAction = BI.inherit(BI.Action, {
         BI.specialCharsMap = BI.specialCharsMap || {};
         url = url || "";
         url = url.replaceAll(BI.keys(BI.specialCharsMap || []).join("|"), function (str) {
+            switch (str) {
+                case "\\":
+                    return BI.specialCharsMap["\\\\"] || str;
+                default:
                     return BI.specialCharsMap[str] || str;
+            }
         });
         return _global.encodeURIComponent(url);
     };

dist/fineui.js

@@ -16185,7 +16185,12 @@ BI.ShowAction = BI.inherit(BI.Action, {
         BI.specialCharsMap = BI.specialCharsMap || {};
         url = url || "";
         url = url.replaceAll(BI.keys(BI.specialCharsMap || []).join("|"), function (str) {
+            switch (str) {
+                case "\\":
+                    return BI.specialCharsMap["\\\\"] || str;
+                default:
                     return BI.specialCharsMap[str] || str;
+            }
         });
         return _global.encodeURIComponent(url);
     };
@@ -44287,7 +44292,7 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
                 },
                 left: 0,
                 right: 3,
-                top: 0,
+                top: 6,
                 bottom: 5
             }]
         });

dist/fineui_without_jquery_polyfill.js

@@ -15690,7 +15690,12 @@ BI.ShowAction = BI.inherit(BI.Action, {
         BI.specialCharsMap = BI.specialCharsMap || {};
         url = url || "";
         url = url.replaceAll(BI.keys(BI.specialCharsMap || []).join("|"), function (str) {
+            switch (str) {
+                case "\\":
+                    return BI.specialCharsMap["\\\\"] || str;
+                default:
                     return BI.specialCharsMap[str] || str;
+            }
         });
         return _global.encodeURIComponent(url);
     };
@@ -31978,7 +31983,7 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
                 },
                 left: 0,
                 right: 3,
-                top: 0,
+                top: 6,
                 bottom: 5
             }]
         });

dist/utils.js

@@ -13038,7 +13038,12 @@ _.extend(BI.OB.prototype, {
         BI.specialCharsMap = BI.specialCharsMap || {};
         url = url || "";
         url = url.replaceAll(BI.keys(BI.specialCharsMap || []).join("|"), function (str) {
+            switch (str) {
+                case "\\":
+                    return BI.specialCharsMap["\\\\"] || str;
+                default:
                     return BI.specialCharsMap[str] || str;
+            }
         });
         return _global.encodeURIComponent(url);
     };

src/base/single/editor/editor.textarea.js

@@ -32,7 +32,7 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
                 },
                 left: 0,
                 right: 3,
-                top: 0,
+                top: 6,
                 bottom: 5
             }]
         });

src/core/alias.js

@@ -589,7 +589,12 @@
         BI.specialCharsMap = BI.specialCharsMap || {};
         url = url || "";
         url = url.replaceAll(BI.keys(BI.specialCharsMap || []).join("|"), function (str) {
+            switch (str) {
+                case "\\":
+                    return BI.specialCharsMap["\\\\"] || str;
+                default:
                     return BI.specialCharsMap[str] || str;
+            }
         });
         return _global.encodeURIComponent(url);
     };