erp5_officejs: use standart submit buttons in erp5_mode and renderjsui_mode

bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_jio_spreadsheet_view_js.xml

@@ -260,9 +260,9 @@
                 page_title: options.doc.title + " | " + options.doc.portal_type,\n
                 back_url: "#page=" +\n
                     options.doc.portal_type.toLowerCase() + "_list",\n
-                panel_action: false\n
+                panel_action: false,\n
                 // breadcrumb_url: all_result[4],\n
-                //save_action: true\n
+                save_action: true\n
               });\n
             })\n
             .push(function () {\n
@@ -468,7 +468,7 @@
             </item>
             <item>
                 <key> <string>serial</string> </key>
-                <value> <string>948.31999.56515.17117</string> </value>
+                <value> <string>948.36396.44642.6109</string> </value>
             </item>
             <item>
                 <key> <string>state</string> </key>
@@ -486,7 +486,7 @@
                     </tuple>
                     <state>
                       <tuple>
-                        <float>1452882676.55</float>
+                        <float>1453145109.87</float>
                         <string>UTC</string>
                       </tuple>
                     </state>

bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_ooffice_js.xml

@@ -113,9 +113,9 @@
         </item>
         <item>
             <key> <string>text_content</string> </key>
-            <value> <string>/*global window, rJS, DocsAPI, console, document*/\n
+            <value> <string>/*global window, rJS, RSVP, DocsAPI, console, document*/\n
 /*jslint nomen: true, maxlen:80, indent:2*/\n
-(function (rJS, DocsAPI) {\n
+(function (rJS, RSVP, DocsAPI) {\n
   "use strict";\n
   // Document Editor event handlers\n
   //function onRequestHistory() {\n
@@ -230,7 +230,7 @@
 \n
   rJS(window)\n
     .ready(function (g) {\n
-      g.props = {};\n
+      g.props = {save_defer: null};\n
     })\n
     .ready(function (g) {\n
       return g.getElement()\n
@@ -380,11 +380,18 @@
               //\'onRequestHistoryData\': onRequestHistoryData,\n
               //\'onRequestHistoryClose\': onRequestHistoryClose,\n
               \'onSave\': function (event) {\n
-                g.props.value = event.data;\n
+                var result = {};\n
+                if (g.props.save_defer === null) {\n
                   g.triggerSubmit();\n
+                } else {\n
+                  result[g.props.key] = event.data;\n
+                  g.props.save_defer.resolve(result);\n
+                  g.props.save_defer = null;\n
+                }\n
                 return true;\n
                 // if you want to async save process return false\n
                 // and call api.processSaveResult when ready\n
+                // g.props.docEditor.processSaveResult();\n
               },\n
               \'onError\': onError\n
             }\n
@@ -397,15 +404,13 @@
     })\n
 \n
     .declareMethod(\'getContent\', function () {\n
-      var result = {};\n
-      //document.getElementsByName(\'frameEditor\')[0]\n
-      //  .contentWindow.document.getElementById(\'id-toolbar-btn-save\').click();\n
-      // this.props.docEditor.processSaveResult();\n
-      result[this.props.key] = this.props.value;\n
-      return result;\n
+      var g = this;\n
+      g.props.save_defer = RSVP.defer();\n
+      g.props.docEditor.save();\n
+      return g.props.save_defer.promise;\n
     });\n
 \n
-}(rJS, DocsAPI));</string> </value>
+}(rJS, RSVP, DocsAPI));</string> </value>
         </item>
         <item>
             <key> <string>version</string> </key>
@@ -532,7 +537,7 @@
             </item>
             <item>
                 <key> <string>serial</string> </key>
-                <value> <string>948.31979.10733.53111</string> </value>
+                <value> <string>948.36349.33632.18926</string> </value>
             </item>
             <item>
                 <key> <string>state</string> </key>
@@ -550,7 +555,7 @@
                     </tuple>
                     <state>
                       <tuple>
-                        <float>1452885806.26</float>
+                        <float>1453142306.9</float>
                         <string>UTC</string>
                       </tuple>
                     </state>

bt5/erp5_officejs/SkinTemplateItem/portal_skins/erp5_officejs_theme/ooffice/apps/api/documents/api.js.xml

@@ -8,7 +8,7 @@
       <dictionary>
         <item>
             <key> <string>_EtagSupport__etag</string> </key>
-            <value> <string>ts50885437.8</string> </value>
+            <value> <string>ts53133045.59</string> </value>
         </item>
         <item>
             <key> <string>__name__</string> </key>
@@ -306,6 +306,16 @@
                 }\r\n
             });\r\n
         };\r\n
+\r\n
+        var _save = function(result, message) {\r\n
+            _sendCommand({\r\n
+                command: \'save\',\r\n
+                data: {\r\n
+                    result: result,\r\n
+                    message: message\r\n
+                }\r\n
+            });\r\n
+        };\r\n
 \r\n
         var _processSaveResult = function(result, message) {\r\n
             _sendCommand({\r\n
@@ -385,6 +395,7 @@
             showError           : _showError,\r\n
             showMessage         : _showMessage,\r\n
             applyEditRights     : _applyEditRights,\r\n
+            save                : _save,\r\n
             processSaveResult   : _processSaveResult,\r\n
             processRightsChange : _processRightsChange,\r\n
             refreshHistory      : _refreshHistory,\r\n
@@ -411,7 +422,7 @@
     };\r\n
 \r\n
     DocsAPI.DocEditor.version = function() {\r\n
-        return \'3.0b.760\';\r\n
+        return \'3.0b##BN#\';\r\n
     };\r\n
 \r\n
     MessageDispatcher = function(fn, scope) {\r\n
@@ -558,7 +569,7 @@
         </item>
         <item>
             <key> <string>size</string> </key>
-            <value> <int>16820</int> </value>
+            <value> <int>17124</int> </value>
         </item>
         <item>
             <key> <string>title</string> </key>

bt5/erp5_officejs/SkinTemplateItem/portal_skins/erp5_officejs_theme/ooffice/apps/documenteditor/main/app.js.xml

@@ -8,7 +8,7 @@
       <dictionary>
         <item>
             <key> <string>_EtagSupport__etag</string> </key>
-            <value> <string>ts52780726.72</string> </value>
+            <value> <string>ts53141051.65</string> </value>
         </item>
         <item>
             <key> <string>__name__</string> </key>
@@ -30,7 +30,7 @@
         </item>
         <item>
             <key> <string>size</string> </key>
-            <value> <int>2472313</int> </value>
+            <value> <int>2472560</int> </value>
         </item>
         <item>
             <key> <string>title</string> </key>
@@ -54,7 +54,7 @@
  *\n
  * http://www.onlyoffice.com \n
  *\n
- * Version: 3.0.0 (build:967, rev:cb3d33b\n
+ * Version: 3.0.0 (build:968, rev:cb3d33b\n
 , date:Fri Dec 18 22:30:55 2015 +0300\n
 )\n
  */\n
@@ -3892,7 +3892,14 @@ function matcherFromTokens( tokens ) {\n
 \t\t\t\tj = ++i;\n
 \t\t\t\tfor ( ; j < len; j++ ) {\n
 \t\t\t\t\tif ( Expr.relative[ tokens[j].type ] ) {\n
-\t\t\t\t\t\tbreak
+\t\t\t\t\t\tbreak;\n
+\t\t\t\t\t}\n
+\t\t\t\t}\n
+\t\t\t\treturn setMatcher(\n
+\t\t\t\t\ti > 1 && elementMatcher( matchers ),\n
+\t\t\t\t\ti > 1 && toSelector(\n
+\t\t\t\t\t\t// If the preceding token was a descendant combinator, insert an implicit any-element `*`\n
+\t\t\t\t\t\ttokens.slice( 0, i - 1 ).concat({ value
 
 ]]></string> </value>
         </item>
@@ -3915,14 +3922,7 @@ function matcherFromTokens( tokens ) {\n
             <key> <string>data</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-;\n
-\t\t\t\t\t}\n
-\t\t\t\t}\n
-\t\t\t\treturn setMatcher(\n
-\t\t\t\t\ti > 1 && elementMatcher( matchers ),\n
-\t\t\t\t\ti > 1 && toSelector(\n
-\t\t\t\t\t\t// If the preceding token was a descendant combinator, insert an implicit any-element `*`\n
-\t\t\t\t\t\ttokens.slice( 0, i - 1 ).concat({ value: tokens[ i - 2 ].type === " " ? "*" : "" })\n
+: tokens[ i - 2 ].type === " " ? "*" : "" })\n
 \t\t\t\t\t).replace( rtrim, "$1" ),\n
 \t\t\t\t\tmatcher,\n
 \t\t\t\t\ti < j && matcherFromTokens( tokens.slice( i, j ) ),\n
@@ -6243,7 +6243,10 @@ jQuery.event = {\n
 \t\t}\n
 \t},\n
 \n
-\ts
+\tsimulate: function( type, elem, event, bubble ) {\n
+\t\t// Piggyback on a donor event to simulate a different one.\n
+\t\t// Fake originalEvent to avoid donor\'s stopPropagation, but if the\n
+\t\t// simulated event prevents default then we do the same on the don
 
 ]]></string> </value>
         </item>
@@ -6266,10 +6269,7 @@ jQuery.event = {\n
             <key> <string>data</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-imulate: function( type, elem, event, bubble ) {\n
-\t\t// Piggyback on a donor event to simulate a different one.\n
-\t\t// Fake originalEvent to avoid donor\'s stopPropagation, but if the\n
-\t\t// simulated event prevents default then we do the same on the donor.\n
+or.\n
 \t\tvar e = jQuery.extend(\n
 \t\t\tnew jQuery.Event(),\n
 \t\t\tevent,\n
@@ -8673,7 +8673,16 @@ jQuery.extend({\n
 \t\tif ( !transport ) {\n
 \t\t\tdone( -1, "No Transport" );\n
 \t\t} else {\n
-\t\t\tjqXHR.r
+\t\t\tjqXHR.readyState = 1;\n
+\n
+\t\t\t// Send global event\n
+\t\t\tif ( fireGlobals ) {\n
+\t\t\t\tglobalEventContext.trigger( "ajaxSend", [ jqXHR, s ] );\n
+\t\t\t}\n
+\t\t\t// Timeout\n
+\t\t\tif ( s.async && s.timeout > 0 ) {\n
+\t\t\t\ttimeoutTimer = setTimeout(function() {\n
+\t\t\t\t\tjqXHR.abort("timeou
 
 ]]></string> </value>
         </item>
@@ -8696,16 +8705,7 @@ jQuery.extend({\n
             <key> <string>data</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-eadyState = 1;\n
-\n
-\t\t\t// Send global event\n
-\t\t\tif ( fireGlobals ) {\n
-\t\t\t\tglobalEventContext.trigger( "ajaxSend", [ jqXHR, s ] );\n
-\t\t\t}\n
-\t\t\t// Timeout\n
-\t\t\tif ( s.async && s.timeout > 0 ) {\n
-\t\t\t\ttimeoutTimer = setTimeout(function() {\n
-\t\t\t\t\tjqXHR.abort("timeout");\n
+t");\n
 \t\t\t\t}, s.timeout );\n
 \t\t\t}\n
 \n
@@ -10876,7 +10876,13 @@ if ( typeof window === "object" && typeof window.document === "object" ) {\n
     },\n
 \n
     // Remove a model, or a list of models from the set.\n
-    remove: function(models,
+    remove: function(models, options) {\n
+      var singular = !_.isArray(models);\n
+      models = singular ? [models] : _.clone(models);\n
+      options || (options = {});\n
+      var i, l, index, model;\n
+      for (i = 0, l = models.length; i < l; i++) {\n
+        model = models[i] 
 
 ]]></string> </value>
         </item>
@@ -10899,13 +10905,7 @@ if ( typeof window === "object" && typeof window.document === "object" ) {\n
             <key> <string>data</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
- options) {\n
-      var singular = !_.isArray(models);\n
-      models = singular ? [models] : _.clone(models);\n
-      options || (options = {});\n
-      var i, l, index, model;\n
-      for (i = 0, l = models.length; i < l; i++) {\n
-        model = models[i] = this.get(models[i]);\n
+= this.get(models[i]);\n
         if (!model) continue;\n
         delete this._byId[model.id];\n
         delete this._byId[model.cid];\n
@@ -12846,7 +12846,12 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
       this.$backdrop = $(\'<div class="modal-backdrop \' + animate + \'" />\')\n
         .appendTo(document.body)\n
 \n
-      this.$
+      this.$element.on(\'click.dismiss.modal\', $.proxy(function (e) {\n
+        if (e.target !== e.currentTarget) return\n
+        this.options.backdrop == \'static\'\n
+          ? this.$element[0].focus.call(this.$element[0])\n
+          : this.hide.call(this)\n
+      },
 
 ]]></string> </value>
         </item>
@@ -12869,12 +12874,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
             <key> <string>data</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-element.on(\'click.dismiss.modal\', $.proxy(function (e) {\n
-        if (e.target !== e.currentTarget) return\n
-        this.options.backdrop == \'static\'\n
-          ? this.$element[0].focus.call(this.$element[0])\n
-          : this.hide.call(this)\n
-      }, this))\n
+ this))\n
 \n
       if (doAnimate) this.$backdrop[0].offsetWidth // force reflow\n
 \n
@@ -14386,6 +14386,9 @@ Common.Gateway = new(function () {\r\n
         "applyEditRights": function (data) {\r\n
             $me.trigger("applyeditrights", data);\r\n
         },\r\n
+        "save": function (data) {\r\n
+            $me.trigger("save", data);\r\n
+        },\r\n
         "processSaveResult": function (data) {\r\n
             $me.trigger("processsaveresult", data);\r\n
         },\r\n
@@ -14803,7 +14806,10 @@ define(\'text\',[\'module\'], function (module) {\n
             }\n
 \n
             //Load the text. Use XHR if possible and in a browser.\n
-            if (!hasLocation || useXhr(url, defaultProtocol, defaultHostName, defaultPort))
+            if (!hasLocation || useXhr(url, defaultProtocol, defaultHostName, defaultPort)) {\n
+                text.get(url, function (content) {\n
+                    text.finishLoad(name, parsed.strip, content, onLoad);\n
+                }, function (err
 
 ]]></string> </value>
         </item>
@@ -14826,10 +14832,7 @@ define(\'text\',[\'module\'], function (module) {\n
             <key> <string>data</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
- {\n
-                text.get(url, function (content) {\n
-                    text.finishLoad(name, parsed.strip, content, onLoad);\n
-                }, function (err) {\n
+) {\n
                     if (onLoad.error) {\n
                         onLoad.error(err);\n
                     }\n
@@ -16346,7 +16349,9 @@ define(\'common/main/lib/component/Button\',["common/main/lib/component/BaseView
  * grant you any rights under trademark law for use of our trademarks.\r\n
  *\r\n
  * All the Product\'s GUI elements, including illustrations and icon sets, as\r\n
- * well as tech
+ * well as technical writing content are licensed under the terms of the\r\n
+ * Creative Commons Attribution-ShareAlike 4.0 International. See the License\r\n
+ * terms at http://cre
 
 ]]></string> </value>
         </item>
@@ -16369,9 +16374,7 @@ define(\'common/main/lib/component/Button\',["common/main/lib/component/BaseView
             <key> <string>data</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-nical writing content are licensed under the terms of the\r\n
- * Creative Commons Attribution-ShareAlike 4.0 International. See the License\r\n
- * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode\r\n
+ativecommons.org/licenses/by-sa/4.0/legalcode\r\n
  *\r\n
  */\r\n
  (function (factory) {\r\n
@@ -17501,7 +17504,11 @@ Common.Utils.RGBColor = function (colorString) {\r\n
                     if (h < 120) {\r\n
                         rgb.g = t1;\r\n
                         rgb.b = t2;\r\n
-          
+                        rgb.r = t1 - t3;\r\n
+                    } else {\r\n
+                        if (h < 180) {\r\n
+                            rgb.g = t1;\r\n
+                 
 
 ]]></string> </value>
         </item>
@@ -17524,11 +17531,7 @@ Common.Utils.RGBColor = function (colorString) {\r\n
             <key> <string>data</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-              rgb.r = t1 - t3;\r\n
-                    } else {\r\n
-                        if (h < 180) {\r\n
-                            rgb.g = t1;\r\n
-                            rgb.r = t2;\r\n
+           rgb.r = t2;\r\n
                             rgb.b = t2 + t3;\r\n
                         } else {\r\n
                             if (h < 240) {\r\n
@@ -19002,7 +19005,9 @@ define(\'common/main/lib/component/Window\',["common/main/lib/component/BaseView
                         me.$window.css({\r\n
                             "-webkit-transition": "0.3s opacity, 0.3s -webkit-transform",\r\n
                             "-webkit-transform": "scale(1)",\r\n
-                            "-moz-transition":
+                            "-moz-transition": "0.3s opacity, 0.3s -moz-transform",\r\n
+                            "-moz-transform": "scale(1)",\r\n
+                            "-ms-transition": "0.3s opacity, 0
 
 ]]></string> </value>
         </item>
@@ -19025,9 +19030,7 @@ define(\'common/main/lib/component/Window\',["common/main/lib/component/BaseView
             <key> <string>data</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
- "0.3s opacity, 0.3s -moz-transform",\r\n
-                            "-moz-transform": "scale(1)",\r\n
-                            "-ms-transition": "0.3s opacity, 0.3s -ms-transform",\r\n
+.3s -ms-transform",\r\n
                             "-ms-transform": "scale(1)",\r\n
                             "-o-transition": "0.3s opacity, 0.3s -o-transform",\r\n
                             "-o-transform": "scale(1)",\r\n
@@ -20264,7 +20267,9 @@ define(\'common/main/lib/view/Comments\',["text!common/main/lib/template/Comment
                 });\r\n
                 if (!elem) {\r\n
                     arr.push({\r\n
-                      
+                        start: offset,\r\n
+                        end: len + offset,\r\n
+                        str: \'<a href="\' + ref + \'" target="_blank" data-can-copy="true">\' + subSt
 
 ]]></string> </value>
         </item>
@@ -20287,9 +20292,7 @@ define(\'common/main/lib/view/Comments\',["text!common/main/lib/template/Comment
             <key> <string>data</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-  start: offset,\r\n
-                        end: len + offset,\r\n
-                        str: \'<a href="\' + ref + \'" target="_blank" data-can-copy="true">\' + subStr + "</a>"\r\n
+r + "</a>"\r\n
                     });\r\n
                 }\r\n
                 return "";\r\n
@@ -21612,7 +21615,12 @@ define(\'common/main/lib/component/LoadMask\',["common/main/lib/component/BaseVi
         txtTitle: "Document Title",\r\n
         txtAuthor: "Author",\r\n
         txtPlacement: "Placement",\r\n
-        txtDate: "Creation Dat
+        txtDate: "Creation Date",\r\n
+        txtStatistics: "Statistics",\r\n
+        txtPages: "Pages",\r\n
+        txtWords: "Words",\r\n
+        txtParagraphs: "Paragraphs",\r\n
+        txtSymbols: "Sy
 
 ]]></string> </value>
         </item>
@@ -21635,12 +21643,7 @@ define(\'common/main/lib/component/LoadMask\',["common/main/lib/component/BaseVi
             <key> <string>data</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-e",\r\n
-        txtStatistics: "Statistics",\r\n
-        txtPages: "Pages",\r\n
-        txtWords: "Words",\r\n
-        txtParagraphs: "Paragraphs",\r\n
-        txtSymbols: "Symbols",\r\n
+mbols",\r\n
         txtSpaces: "Symbols with spaces",\r\n
         txtLoading: "Loading..."\r\n
     },\r\n
@@ -23134,7 +23137,10 @@ define(\'common/main/lib/component/Menu\',["common/main/lib/extend/Bootstrap", "
                         this.mustLayout = true;\r\n
                         return;\r\n
                     }\r\n
-                    var me = this
+                    var me = this,\r\n
+                    el = this.cmpEl;\r\n
+                    var menuRoot = (el.attr("role") === "menu") ? el : el.find("[role=menu]");\r\n
+                    if 
 
 ]]></string> </value>
         </item>
@@ -23157,10 +23163,7 @@ define(\'common/main/lib/component/Menu\',["common/main/lib/extend/Bootstrap", "
             <key> <string>data</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-,\r\n
-                    el = this.cmpEl;\r\n
-                    var menuRoot = (el.attr("role") === "menu") ? el : el.find("[role=menu]");\r\n
-                    if (!menuRoot.is(":visible")) {\r\n
+(!menuRoot.is(":visible")) {\r\n
                         var pos = [menuRoot.css("left"), menuRoot.css("top")];\r\n
                         menuRoot.css({\r\n
                             left: "-1000px",\r\n
@@ -24315,7 +24318,12 @@ define(\'common/main/lib/component/MetricSpinner\',["common/main/lib/component/B
                 this.trigger("change", this, this.value, this.lastValue);\r\n
             }\r\n
             if (suspendchange !== true && showError) {\r\n
-                this.trigger("inputerror", this, thi
+                this.trigger("inputerror", this, this.value);\r\n
+            }\r\n
+            if (this.rendered) {\r\n
+                this.setRawValue(this.value);\r\n
+            } else {\r\n
+                this.options.va
 
 ]]></string> </value>
         </item>
@@ -24338,12 +24346,7 @@ define(\'common/main/lib/component/MetricSpinner\',["common/main/lib/component/B
             <key> <string>data</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-s.value);\r\n
-            }\r\n
-            if (this.rendered) {\r\n
-                this.setRawValue(this.value);\r\n
-            } else {\r\n
-                this.options.value = this.value;\r\n
+lue = this.value;\r\n
             }\r\n
         },\r\n
         onMouseDown: function (type, e) {\r\n
@@ -25551,7 +25554,9 @@ define(\'common/main/lib/component/MaskedField\',["common/main/lib/component/Bas
  * that Ascensio System SIA expressly excludes the warranty of non-infringement\r\n
  * of any third-party rights.\r\n
  *\r\n
- * This program is distributed W
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied \r\n
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For \r\n
+ * details, see the GNU AGPL at: http
 
 ]]></string> </value>
         </item>
@@ -25574,9 +25579,7 @@ define(\'common/main/lib/component/MaskedField\',["common/main/lib/component/Bas
             <key> <string>data</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-ITHOUT ANY WARRANTY; without even the implied \r\n
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For \r\n
- * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html\r\n
+://www.gnu.org/licenses/agpl-3.0.html\r\n
  *\r\n
  * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia,\r\n
  * EU, LV-1021.\r\n
@@ -27080,7 +27083,10 @@ define(\'documenteditor/main/app/view/DropcapSettingsAdvanced\',["text!documente
             }).on("change", _.bind(function (field, newValue, oldValue) {\r\n
                 if (!this._noApply) {\r\n
                     if (_.isUndefined(this.Margins)) {\r\n
-             
+                        this.Margins = {};\r\n
+                    }\r\n
+                    this.Margins.Bottom = Common.Utils.Metric.fnRecalcToMM(field.getNumberValue());\r\n
+     
 
 ]]></string> </value>
         </item>
@@ -27103,10 +27109,7 @@ define(\'documenteditor/main/app/view/DropcapSettingsAdvanced\',["text!documente
             <key> <string>data</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-           this.Margins = {};\r\n
-                    }\r\n
-                    this.Margins.Bottom = Common.Utils.Metric.fnRecalcToMM(field.getNumberValue());\r\n
-                }\r\n
+           }\r\n
             },\r\n
             me));\r\n
             this.spnMarginRight = new Common.UI.MetricSpinner({\r\n
@@ -28489,7 +28492,11 @@ define(\'common/main/lib/component/InputField\',["common/main/lib/component/Base
                 this.trigger("changed:before", this, newValue, oldValue, e);\r\n
                 if (e.isDefaultPrevented()) {\r\n
                     return;\r\n
-    
+                }\r\n
+                this.value = newValue;\r\n
+                if (this.validateOnBlur) {\r\n
+                    this.checkValidate();\r\n
+                }\r
 
 ]]></string> </value>
         </item>
@@ -28512,11 +28519,7 @@ define(\'common/main/lib/component/InputField\',["common/main/lib/component/Base
             <key> <string>data</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-            }\r\n
-                this.value = newValue;\r\n
-                if (this.validateOnBlur) {\r\n
-                    this.checkValidate();\r\n
-                }\r\n
+\n
                 this.trigger("changed:after", this, newValue, oldValue, e);\r\n
             },\r\n
             onInputChanged: function (e, extra) {\r\n
@@ -29837,7 +29840,12 @@ define(\'common/main/lib/component/ListView\',["common/main/lib/component/DataVi
             });\r\n
             this.chAllCaps.on("change", _.bind(this.onAllCapsChange, this));\r\n
             this.numSpacing = new Common.UI.MetricSpinner({\r\n
-                el: $("#paragraphadv-spin-spaci
+                el: $("#paragraphadv-spin-spacing"),\r\n
+                step: 0.01,\r\n
+                width: 100,\r\n
+                defaultUnit: "cm",\r\n
+                defaultValue: 0,\r\n
+                value: "0
 
 ]]></string> </value>
         </item>
@@ -29860,12 +29868,7 @@ define(\'common/main/lib/component/ListView\',["common/main/lib/component/DataVi
             <key> <string>data</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-ng"),\r\n
-                step: 0.01,\r\n
-                width: 100,\r\n
-                defaultUnit: "cm",\r\n
-                defaultValue: 0,\r\n
-                value: "0 cm",\r\n
+ cm",\r\n
                 maxValue: 55.87,\r\n
                 minValue: -55.87\r\n
             });\r\n
@@ -30879,7 +30882,11 @@ define(\'text!documenteditor/main/app/template/TableSettingsAdvanced.template\',
                 if (this._changedProps) {\r\n
                     this._changedProps.put_Spacing(Common.Utils.Metric.fnRecalcToMM(field.getNumberValue()));\r\n
                 }\r\n
-            },\r
+            },\r\n
+            this));\r\n
+            this.spinners.push(this.nfSpacing);\r\n
+            this.chAutofit = new Common.UI.CheckBox({\r\n
+                el: $("#tableadv-c
 
 ]]></string> </value>
         </item>
@@ -30902,11 +30909,7 @@ define(\'text!documenteditor/main/app/template/TableSettingsAdvanced.template\',
             <key> <string>data</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-\n
-            this));\r\n
-            this.spinners.push(this.nfSpacing);\r\n
-            this.chAutofit = new Common.UI.CheckBox({\r\n
-                el: $("#tableadv-checkbox-autofit"),\r\n
+heckbox-autofit"),\r\n
                 value: true,\r\n
                 labelText: this.textAutofit\r\n
             });\r\n
@@ -32443,7 +32446,13 @@ define(\'text!documenteditor/main/app/template/TableSettingsAdvanced.template\',
                 tableProps: this._changedProps,\r\n
                 borderProps: {\r\n
                     borderSize: this.BorderSize,\r\n
-                    borderColor: this.btnBorderColor.color
+                    borderColor: this.btnBorderColor.color\r\n
+                }\r\n
+            };\r\n
+        },\r\n
+        _setDefaults: function (props) {\r\n
+            if (props) {\r\n
+                this._allTable = !props.get
 
 ]]></string> </value>
         </item>
@@ -32466,13 +32475,7 @@ define(\'text!documenteditor/main/app/template/TableSettingsAdvanced.template\',
             <key> <string>data</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-\r\n
-                }\r\n
-            };\r\n
-        },\r\n
-        _setDefaults: function (props) {\r\n
-            if (props) {\r\n
-                this._allTable = !props.get_CellSelect();\r\n
+_CellSelect();\r\n
                 var value;\r\n
                 var TableWidth = props.get_Width();\r\n
                 if (TableWidth !== null) {\r\n
@@ -33631,7 +33634,10 @@ define(\'text!documenteditor/main/app/template/TableSettingsAdvanced.template\',
                     var key = event.keyCode;\r\n
                     if ((event.ctrlKey || event.metaKey) && !event.shiftKey) {\r\n
                         if (key === Common.UI.Keys.NUM_PLUS || key === Common.UI.Keys.EQUALITY || (Common.Utils.isOpera && key == 43)) {\r\n
-                            me
+                            me.api.zoomIn();\r\n
+                            event.preventDefault();\r\n
+                            event.stopPropagation();\r\n
+                            return fa
 
 ]]></string> </value>
         </item>
@@ -33654,10 +33660,7 @@ define(\'text!documenteditor/main/app/template/TableSettingsAdvanced.template\',
             <key> <string>data</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-.api.zoomIn();\r\n
-                            event.preventDefault();\r\n
-                            event.stopPropagation();\r\n
-                            return false;\r\n
+lse;\r\n
                         } else {\r\n
                             if (key === Common.UI.Keys.NUM_MINUS || key === Common.UI.Keys.MINUS || (Common.Utils.isOpera && key == 45)) {\r\n
                                 me.api.zoomOut();\r\n
@@ -34889,7 +34892,12 @@ define(\'text!documenteditor/main/app/template/TableSettingsAdvanced.template\',
                 caption: me.hyperlinkText,\r\n
                 menu: new Common.UI.Menu({\r\n
                     menuAlign: "tl-tr",\r\n
-                    items: [menuEditHyperlinkTable, menuRemoveHy
+                    items: [menuEditHyperlinkTable, menuRemoveHyperlinkTable]\r\n
+                })\r\n
+            });\r\n
+            var menuAddCommentTable = new Common.UI.MenuItem({\r\n
+                caption: me.addCommentText\r\n
+
 
 ]]></string> </value>
         </item>
@@ -34912,11 +34920,6 @@ define(\'text!documenteditor/main/app/template/TableSettingsAdvanced.template\',
             <key> <string>data</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-perlinkTable]\r\n
-                })\r\n
-            });\r\n
-            var menuAddCommentTable = new Common.UI.MenuItem({\r\n
-                caption: me.addCommentText\r\n
             }).on("click", _.bind(me.addComment, me));\r\n
             var menuAddHyperlinkTable = new Common.UI.MenuItem({\r\n
                 caption: me.hyperlinkText\r\n
@@ -35977,7 +35980,9 @@ define(\'common/main/lib/component/ColorPalette\',["common/main/lib/component/Ba
  if (Common === undefined) {\r\n
     var Common = {};\r\n
 }\r\n
-define(\'common/main/lib/component/DimensionPicker\',["common/main/
+define(\'common/main/lib/component/DimensionPicker\',["common/main/lib/component/BaseView"], function () {\r\n
+    Common.UI.DimensionPicker = Common.UI.BaseView.extend((function () {\r\n
+        var me, rootEl, areaMouseCatcher, are
 
 ]]></string> </value>
         </item>
@@ -36000,9 +36005,7 @@ define(\'common/main/lib/component/DimensionPicker\',["common/main/
             <key> <string>data</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-lib/component/BaseView"], function () {\r\n
-    Common.UI.DimensionPicker = Common.UI.BaseView.extend((function () {\r\n
-        var me, rootEl, areaMouseCatcher, areaUnHighLighted, areaHighLighted, areaStatus, curColumns = 0,\r\n
+aUnHighLighted, areaHighLighted, areaStatus, curColumns = 0,\r\n
         curRows = 0;\r\n
         var onMouseMove = function (event) {\r\n
             me.setTableSize(Math.ceil((event.offsetX === undefined ? event.originalEvent.layerX : event.offsetX) / me.itemSize), Math.ceil((event.offsetY === undefined ? event.originalEvent.layerY : event.offsetY) / me.itemSize), event);\r\n
@@ -37360,7 +37363,8 @@ define(\'common/main/lib/component/SynchronizeTip\',["common/main/lib/component/
                     }), this.btnFitWidth = new Common.UI.MenuItem({\r\n
                         caption: this.textFitWidth,\r\n
                         checkable: true\r\n
-     
+                    }), (new Common.UI.MenuItem({\r\n
+                        template: _.template([\'<div id="id-toolbar-menu-zoom" class="menu-zoom" style="height: 25p
 
 ]]></string> </value>
         </item>
@@ -37383,8 +37387,7 @@ define(\'common/main/lib/component/SynchronizeTip\',["common/main/lib/component/
             <key> <string>data</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-               }), (new Common.UI.MenuItem({\r\n
-                        template: _.template([\'<div id="id-toolbar-menu-zoom" class="menu-zoom" style="height: 25px;" \', "<% if(!_.isUndefined(options.stopPropagation)) { %>", \'data-stopPropagation="true"\', "<% } %>", ">", \'<label class="title">\' + this.textZoom + "</label>", \'<button id="id-menu-zoom-in" type="button" style="float:right; margin: 2px 5px 0 0;" class="btn small btn-toolbar btn-toolbar-default"><span class="btn-icon btn-zoomin">&nbsp;</span></button>\', \'<label class="zoom">100%</label>\', \'<button id="id-menu-zoom-out" type="button" style="float:right; margin-top: 2px;" class="btn small btn-toolbar btn-toolbar-default"><span class="btn-icon btn-zoomout">&nbsp;</span></button>\', "</div>"].join("")),\r\n
+x;" \', "<% if(!_.isUndefined(options.stopPropagation)) { %>", \'data-stopPropagation="true"\', "<% } %>", ">", \'<label class="title">\' + this.textZoom + "</label>", \'<button id="id-menu-zoom-in" type="button" style="float:right; margin: 2px 5px 0 0;" class="btn small btn-toolbar btn-toolbar-default"><span class="btn-icon btn-zoomin">&nbsp;</span></button>\', \'<label class="zoom">100%</label>\', \'<button id="id-menu-zoom-out" type="button" style="float:right; margin-top: 2px;" class="btn small btn-toolbar btn-toolbar-default"><span class="btn-icon btn-zoomout">&nbsp;</span></button>\', "</div>"].join("")),\r\n
                         stopPropagation: true\r\n
                     }))]\r\n
                 })\r\n
@@ -38911,7 +38914,11 @@ define(\'common/main/lib/component/SynchronizeTip\',["common/main/lib/component/
                 can_copycut: undefined,\r\n
                 show_copywarning: true\r\n
             };\r\n
-        
+            this.flg = {};\r\n
+            this.diagramEditor = null;\r\n
+            this._isAddingShape = false;\r\n
+            this._isAddingEquation = false;\r\n
+            t
 
 ]]></string> </value>
         </item>
@@ -38934,11 +38941,7 @@ define(\'common/main/lib/component/SynchronizeTip\',["common/main/lib/component/
             <key> <string>data</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-    this.flg = {};\r\n
-            this.diagramEditor = null;\r\n
-            this._isAddingShape = false;\r\n
-            this._isAddingEquation = false;\r\n
-            this.editMode = true;\r\n
+his.editMode = true;\r\n
             this.addListeners({\r\n
                 "Toolbar": {\r\n
                     "changecompact": this.onChangeCompactView\r\n
@@ -40234,7 +40237,11 @@ define(\'common/main/lib/component/SynchronizeTip\',["common/main/lib/component/
             Common.component.Analytics.trackEvent("ToolBar", "Page Number");\r\n
         },\r\n
         onListStyleSelect: function (combo, record) {\r\n
-            this._state.prstyle = und
+            this._state.prstyle = undefined;\r\n
+            if (this.api) {\r\n
+                this.api.put_Style(record.get("title"));\r\n
+            }\r\n
+            Common.NotificationCenter.trigger("ed
 
 ]]></string> </value>
         </item>
@@ -40257,11 +40264,7 @@ define(\'common/main/lib/component/SynchronizeTip\',["common/main/lib/component/
             <key> <string>data</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-efined;\r\n
-            if (this.api) {\r\n
-                this.api.put_Style(record.get("title"));\r\n
-            }\r\n
-            Common.NotificationCenter.trigger("edit:complete", this.toolbar);\r\n
+it:complete", this.toolbar);\r\n
             Common.component.Analytics.trackEvent("ToolBar", "Style");\r\n
         },\r\n
         onHideTitleBar: function (item, checked) {\r\n
@@ -41583,7 +41586,7 @@ efined;\r\n
     DE.Controllers.Toolbar || {}));\r\n
 });\n
 \n
-define(\'text!documenteditor/main/app/template/StatusBar.template\',[],function () { return \'\\r\\n<div class="statusbar" style="display:table;">\\r\\n    <div class="status-group dropup">\\r\\n        <label id="status-label-pages" class="status-label" style="margin-left: 40px;" data-toggle="dropdown"><%= Common.Utils.String.format(scope.pageIndexText, 1, 1) %></label>\\r\\n        <div id="status-goto-box" class="dropdown-menu">\\r\\n            <label style="float:left;line-height:22px;"><%= scope.goToPageText %></label>\\r\\n            <div id="status-goto-page" style="display:inline-block;"></div>\\r\\n        </div>\\r\\n    </div>\\r\\n    <!-- /** coauthoring begin **/ -->\\r\\n    <div id="status-users-ct" class="status-group" style="display:none;">\\r\\n        <div class="separator short" style="margin-right: 12px; margin-left: 40px;" />\\r\\n        <div id="status-users-block" style="display:inline-block; cursor:pointer;">\\r\\n            <span id="status-users-icon" />\\r\\n            <label id="status-users-c
+define(\'text!documenteditor/main/app/template/StatusBar.template\',[],function () { return \'\\r\\n<div class="statusbar" style="display:table;">\\r\\n    <div class="status-group dropup">\\r\\n        <label id="status-label-pages" class="status-label" style="margin-left: 40px;" data-toggle="dropdown"><%= Common.Utils.String.format(scope.pageIndexText, 1, 1) %></label>\\r\\n        <div id="status-goto-box" class="dropdown-menu">\\r\\n            <label style="float:left;line-height:22px;"><%= scope.goToPageText %></label>\\r\\n            <div id="status-goto-page" style="display:inline-block;"></div>\\r\\n        </div>\\r\\n    </div>\\r\\n    <!-- /** coauthoring begin **/ -->\\r\\n    <div id="status-users-ct" class="status-group" style="display:none;">\\r\\n        <div class="separator short" style="margin-right: 12px; margin-left: 40px;" />\\r\\n        <div id="status-users-block" style="display:inline-block; cursor:pointer;">\\r\\n            <span id="status-users-icon" />\\r\\n            <label id="status-users-count" class="status-label">3</label>\\r\\n        </div>\\r\\n        <div class="separator short" style="margin-left: 10px;" />\\r\\n    </div>\\r\\n    <!-- /** coaut
 
 ]]></string> </value>
         </item>
@@ -41606,7 +41609,7 @@ define(\'text!documenteditor/main/app/template/StatusBar.template\',[],function
             <key> <string>data</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-ount" class="status-label">3</label>\\r\\n        </div>\\r\\n        <div class="separator short" style="margin-left: 10px;" />\\r\\n    </div>\\r\\n    <!-- /** coauthoring end **/ -->\\r\\n    <div class="status-group" style="width:100%; text-align:center;">\\r\\n        <label id="status-label-action" class="status-label"></label>\\r\\n    </div>\\r\\n    <div class="status-group" style="">\\r\\n        <div class="separator short el-edit"></div>\\r\\n        <div class="cnt-lang el-edit">\\r\\n            <div class="dropdown-toggle" data-toggle="dropdown" style="margin-right: 6px;">\\r\\n                <span class="icon-lang-flag" data-vertical-offset="10" />\\r\\n                <label id="status-label-lang" class="status-label">English (United States)</label>\\r\\n                <div class="caret up" />\\r\\n            </div>\\r\\n        </div>\\r\\n        <button id="btn-doc-lang" type="button" class="btn small btn-toolbar btn-toolbar-default el-edit"><span class="btn-icon">&nbsp;</span></button>\\r\\n        <button id="btn-doc-spell" type="button" class="btn small btn-toolbar btn-toolbar-default el-edit"><span class="btn-icon">&nbsp;</span></button>\\r\\n        <div class="separator short el-edit"></div>\\r\\n        <button id="btn-zoom-topage" type="button" class="btn small btn-toolbar btn-toolbar-default"><span class="btn-icon">&nbsp;</span></button>\\r\\n        <button id="btn-zoom-towidth" type="button" class="btn small btn-toolbar btn-toolbar-default"><span class="btn-icon">&nbsp;</span></button>\\r\\n        <button id="btn-zoom-down" type="button" class="btn small btn-toolbar btn-toolbar-default"><span class="btn-icon">&nbsp;</span></button>\\r\\n        <div class="cnt-zoom">\\r\\n            <div class="dropdown-toggle" data-toggle="dropdown">\\r\\n                <label id="status-label-zoom" class="status-label">Zoom 100%</label>\\r\\n            </div>\\r\\n        </div>\\r\\n        <button id="btn-zoom-up" type="button" class="btn small btn-toolbar btn-toolbar-default" style="margin-right:40px;"><span class="btn-icon">&nbsp;</span></button>\\r\\n    </div>\\r\\n</div>\\r\\n\';});\n
+horing end **/ -->\\r\\n    <div class="status-group" style="width:100%; text-align:center;">\\r\\n        <label id="status-label-action" class="status-label"></label>\\r\\n    </div>\\r\\n    <div class="status-group" style="">\\r\\n        <div class="separator short el-edit"></div>\\r\\n        <div class="cnt-lang el-edit">\\r\\n            <div class="dropdown-toggle" data-toggle="dropdown" style="margin-right: 6px;">\\r\\n                <span class="icon-lang-flag" data-vertical-offset="10" />\\r\\n                <label id="status-label-lang" class="status-label">English (United States)</label>\\r\\n                <div class="caret up" />\\r\\n            </div>\\r\\n        </div>\\r\\n        <button id="btn-doc-lang" type="button" class="btn small btn-toolbar btn-toolbar-default el-edit"><span class="btn-icon">&nbsp;</span></button>\\r\\n        <button id="btn-doc-spell" type="button" class="btn small btn-toolbar btn-toolbar-default el-edit"><span class="btn-icon">&nbsp;</span></button>\\r\\n        <div class="separator short el-edit"></div>\\r\\n        <button id="btn-zoom-topage" type="button" class="btn small btn-toolbar btn-toolbar-default"><span class="btn-icon">&nbsp;</span></button>\\r\\n        <button id="btn-zoom-towidth" type="button" class="btn small btn-toolbar btn-toolbar-default"><span class="btn-icon">&nbsp;</span></button>\\r\\n        <button id="btn-zoom-down" type="button" class="btn small btn-toolbar btn-toolbar-default"><span class="btn-icon">&nbsp;</span></button>\\r\\n        <div class="cnt-zoom">\\r\\n            <div class="dropdown-toggle" data-toggle="dropdown">\\r\\n                <label id="status-label-zoom" class="status-label">Zoom 100%</label>\\r\\n            </div>\\r\\n        </div>\\r\\n        <button id="btn-zoom-up" type="button" class="btn small btn-toolbar btn-toolbar-default" style="margin-right:40px;"><span class="btn-icon">&nbsp;</span></button>\\r\\n    </div>\\r\\n</div>\\r\\n\';});\n
 \n
 /*\r\n
  * (c) Copyright Ascensio System SIA 2010-2015\r\n
@@ -42956,7 +42959,12 @@ define(\'text!documenteditor/main/app/template/ParagraphSettings.template\',[],f
                     {\r\n
                         color: "000000",\r\n
                         effectId: 1\r\n
-   
+                    },\r\n
+                    {\r\n
+                        color: "000000",\r\n
+                        effectId: 1\r\n
+                    },\r\n
+             
 
 ]]></string> </value>
         </item>
@@ -42979,12 +42987,7 @@ define(\'text!documenteditor/main/app/template/ParagraphSettings.template\',[],f
             <key> <string>data</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-                 },\r\n
-                    {\r\n
-                        color: "000000",\r\n
-                        effectId: 1\r\n
-                    },\r\n
-                    {\r\n
+       {\r\n
                         color: "FFFFFF",\r\n
                         effectId: 2\r\n
                     },\r\n
@@ -44022,7 +44025,11 @@ define(\'text!documenteditor/main/app/template/ImageSettingsAdvanced.template\',
                     this._changedProps.get_PositionH().put_Value(Common.Utils.Metric.fnRecalcToMM(field.getNumberValue()));\r\n
                     this._state.spnXChanged = true;\r\n
                 }\r\n
-       
+            },\r\n
+            this));\r\n
+            this.spinners.push(this.spnX);\r\n
+            this.spnY = new Common.UI.MetricSpinner({\r\n
+                el: $("#image-s
 
 ]]></string> </value>
         </item>
@@ -44045,11 +44052,7 @@ define(\'text!documenteditor/main/app/template/ImageSettingsAdvanced.template\',
             <key> <string>data</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-     },\r\n
-            this));\r\n
-            this.spinners.push(this.spnX);\r\n
-            this.spnY = new Common.UI.MetricSpinner({\r\n
-                el: $("#image-spin-y"),\r\n
+pin-y"),\r\n
                 step: 0.1,\r\n
                 width: 115,\r\n
                 disabled: true,\r\n
@@ -45332,7 +45335,11 @@ define(\'text!documenteditor/main/app/template/ImageSettingsAdvanced.template\',
         _ImgWrapStyleChanged: function (style) {\r\n
             if (this._state.WrappingStyle !== style) {\r\n
                 this._noApply = true;\r\n
-                var record = this.mnuWr
+                var record = this.mnuWrapPicker.store.findWhere({\r\n
+                    data: style\r\n
+                });\r\n
+                this.mnuWrapPicker.selectRecord(record, true);\r\n
+              
 
 ]]></string> </value>
         </item>
@@ -45355,11 +45362,7 @@ define(\'text!documenteditor/main/app/template/ImageSettingsAdvanced.template\',
             <key> <string>data</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-apPicker.store.findWhere({\r\n
-                    data: style\r\n
-                });\r\n
-                this.mnuWrapPicker.selectRecord(record, true);\r\n
-                if (record) {\r\n
+  if (record) {\r\n
                     this.btnWrapType.setIconCls("item-wrap " + record.get("iconcls"));\r\n
                 }\r\n
                 this._state.WrappingStyle = style;\r\n
@@ -46585,7 +46588,12 @@ define(\'common/main/lib/component/ComboBorderSize\',["common/main/lib/component
                     {\r\n
                         color: "008000",\r\n
                         effectId: 4\r\n
- 
+                    },\r\n
+                    "-", {\r\n
+                        color: "000000",\r\n
+                        effectId: 1\r\n
+                    },\r\n
+      
 
 ]]></string> </value>
         </item>
@@ -46608,12 +46616,7 @@ define(\'common/main/lib/component/ComboBorderSize\',["common/main/lib/component
             <key> <string>data</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-                   },\r\n
-                    "-", {\r\n
-                        color: "000000",\r\n
-                        effectId: 1\r\n
-                    },\r\n
-                    {\r\n
+              {\r\n
                         color: "FFFFFF",\r\n
                         effectId: 2\r\n
                     },\r\n
@@ -48002,7 +48005,10 @@ define(\'common/main/lib/component/Slider\',["common/main/lib/component/BaseView
                         var above = me.thumbs[i + 1];\r\n
                         var below = me.thumbs[i - 1];\r\n
                         if (below !== undefined && pos < below.position) {\r\n
-       
+                            continue;\r\n
+                        }\r\n
+                        if (above !== undefined && pos > above.position) {\r\n
+                         
 
 ]]></string> </value>
         </item>
@@ -48025,10 +48031,7 @@ define(\'common/main/lib/component/Slider\',["common/main/lib/component/BaseView
             <key> <string>data</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-                     continue;\r\n
-                        }\r\n
-                        if (above !== undefined && pos > above.position) {\r\n
-                            continue;\r\n
+   continue;\r\n
                         }\r\n
                         index = i;\r\n
                         nearest = dist;\r\n
@@ -49739,7 +49742,12 @@ define(\'common/main/lib/component/MultiSliderGradient\',["common/main/lib/compo
                     {\r\n
                         color: "000000",\r\n
                         effectId: 1\r\n
-   
+                    },\r\n
+                    {\r\n
+                        color: "FFFFFF",\r\n
+                        effectId: 2\r\n
+                    },\r\n
+             
 
 ]]></string> </value>
         </item>
@@ -49762,12 +49770,7 @@ define(\'common/main/lib/component/MultiSliderGradient\',["common/main/lib/compo
             <key> <string>data</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-                 },\r\n
-                    {\r\n
-                        color: "FFFFFF",\r\n
-                        effectId: 2\r\n
-                    },\r\n
-                    {\r\n
+       {\r\n
                         color: "000000",\r\n
                         effectId: 1\r\n
                     },\r\n
@@ -50995,7 +50998,11 @@ define(\'common/main/lib/component/MultiSliderGradient\',["common/main/lib/compo
                                 break;\r\n
                             }\r\n
                         }\r\n
-                        if (!iss
+                        if (!isselected) {\r\n
+                            this.colorsGrad.clearSelection();\r\n
+                        }\r\n
+                    } else {\r\n
+                        this
 
 ]]></string> </value>
         </item>
@@ -51018,11 +51025,7 @@ define(\'common/main/lib/component/MultiSliderGradient\',["common/main/lib/compo
             <key> <string>data</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-elected) {\r\n
-                            this.colorsGrad.clearSelection();\r\n
-                        }\r\n
-                    } else {\r\n
-                        this.colorsGrad.select(color, true);\r\n
+.colorsGrad.select(color, true);\r\n
                     }\r\n
                     this._state.GradColor = color;\r\n
                 }\r\n
@@ -52551,7 +52554,13 @@ define(\'common/main/lib/util/Shortcuts\',["backbone", "keymaster"], function (B
                     var me = this;\r\n
                     Common.UI.info({\r\n
                         msg: this.textNoTextFound,\r\n
-                        callback: 
+                        callback: function () {\r\n
+                            me.dlgSearch.focus();\r\n
+                        }\r\n
+                    });\r\n
+                }\r\n
+            }\r\n
+        
 
 ]]></string> </value>
         </item>
@@ -52574,13 +52583,7 @@ define(\'common/main/lib/util/Shortcuts\',["backbone", "keymaster"], function (B
             <key> <string>data</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-function () {\r\n
-                            me.dlgSearch.focus();\r\n
-                        }\r\n
-                    });\r\n
-                }\r\n
-            }\r\n
-        },\r\n
+},\r\n
         onQueryReplaceAll: function (w, opts) {\r\n
             if (!_.isEmpty(opts.textsearch) && !_.isEmpty(opts.textreplace)) {\r\n
                 this.api.asc_replaceText(opts.textsearch, opts.textreplace, true, opts.matchcase, opts.matchword);\r\n
@@ -53342,6 +53345,9 @@ define(\'common/main/lib/controller/Fonts\',["core", "common/main/lib/collection
                     this.getApplication().getController("Viewport").getView("Common.Views.Header").setDocumentCaption(data.doc.title);\r\n
                 }\r\n
             },\r\n
+            onSave: function (data) {\r\n
+                this.api.asc_Save();\r\n
+            },\r\n
             onProcessSaveResult: function (data) {\r\n
                 // XXX\r\n
                 //this.api.asc_OnSaveEnd(data.result);\r\n
@@ -53789,6 +53795,7 @@ define(\'common/main/lib/controller/Fonts\',["core", "common/main/lib/collection
                     Common.component.Analytics.initialize("UA-12442749-13", "Document Editor");\r\n
                 }\r\n
                 Common.Gateway.on("applyeditrights", _.bind(me.onApplyEditRights, me));\r\n
+                Common.Gateway.on("save", _.bind(me.onSave, me));\r\n
                 Common.Gateway.on("processsaveresult", _.bind(me.onProcessSaveResult, me));\r\n
                 Common.Gateway.on("processrightschange", _.bind(me.onProcessRightsChange, me));\r\n
                 Common.Gateway.on("processmouse", _.bind(me.onProcessMouse, me));\r\n

bt5/erp5_officejs/SkinTemplateItem/portal_skins/erp5_officejs_theme/ooffice/apps/spreadsheeteditor/main/app.js.xml

@@ -8,7 +8,7 @@
       <dictionary>
         <item>
             <key> <string>_EtagSupport__etag</string> </key>
-            <value> <string>ts52780006.08</string> </value>
+            <value> <string>ts53132999.51</string> </value>
         </item>
         <item>
             <key> <string>__name__</string> </key>
@@ -30,7 +30,7 @@
         </item>
         <item>
             <key> <string>size</string> </key>
-            <value> <int>2157758</int> </value>
+            <value> <int>2158117</int> </value>
         </item>
         <item>
             <key> <string>title</string> </key>
@@ -54,7 +54,7 @@
  *\n
  * http://www.onlyoffice.com \n
  *\n
- * Version: 3.0.0 (build:862, rev:cb3d33b\n
+ * Version: 3.0.0 (build:864, rev:cb3d33b\n
 , date:Fri Dec 18 22:30:55 2015 +0300\n
 )\n
  */\n
@@ -4358,7 +4358,20 @@ jQuery.Callbacks = function( options ) {\n
 \t\t\tlocked: function() {\n
 \t\t\t\treturn !stack;\n
 \t\t\t},\n
-\t\t\t// Call all callbacks 
+\t\t\t// Call all callbacks with the given context and arguments\n
+\t\t\tfireWith: function( context, args ) {\n
+\t\t\t\tif ( list && ( !fired || stack ) ) {\n
+\t\t\t\t\targs = args || [];\n
+\t\t\t\t\targs = [ context, args.slice ? args.slice() : args ];\n
+\t\t\t\t\tif ( firing ) {\n
+\t\t\t\t\t\tstack.push( args );\n
+\t\t\t\t\t} else {\n
+\t\t\t\t\t\tfire( args );\n
+\t\t\t\t\t}\n
+\t\t\t\t}\n
+\t\t\t\treturn this;\n
+\t\t\t},\n
+\t\t\t// Call all the callbacks with the gi
 
 ]]></string> </value>
         </item>
@@ -4381,20 +4394,7 @@ jQuery.Callbacks = function( options ) {\n
             <key> <string>data</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-with the given context and arguments\n
-\t\t\tfireWith: function( context, args ) {\n
-\t\t\t\tif ( list && ( !fired || stack ) ) {\n
-\t\t\t\t\targs = args || [];\n
-\t\t\t\t\targs = [ context, args.slice ? args.slice() : args ];\n
-\t\t\t\t\tif ( firing ) {\n
-\t\t\t\t\t\tstack.push( args );\n
-\t\t\t\t\t} else {\n
-\t\t\t\t\t\tfire( args );\n
-\t\t\t\t\t}\n
-\t\t\t\t}\n
-\t\t\t\treturn this;\n
-\t\t\t},\n
-\t\t\t// Call all the callbacks with the given arguments\n
+ven arguments\n
 \t\t\tfire: function() {\n
 \t\t\t\tself.fireWith( this, arguments );\n
 \t\t\t\treturn this;\n
@@ -6769,7 +6769,18 @@ function winnow( elements, qualifier, not ) {\n
 \t\t\treturn jQuery.filter( qualifier, elements, not );\n
 \t\t}\n
 \n
-\t\tqualifier = jQu
+\t\tqualifier = jQuery.filter( qualifier, elements );\n
+\t}\n
+\n
+\treturn jQuery.grep( elements, function( elem ) {\n
+\t\treturn ( core_indexOf.call( qualifier, elem ) >= 0 ) !== not;\n
+\t});\n
+}\n
+var rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\\w:]+)[^>]*)\\/>/gi,\n
+\trtagName = /<([\\w:]+)/,\n
+\trhtml = /<|&#?\\w+;/,\n
+\trnoInnerhtml = /<(?:script|style|link)/i,\n
+\tmanipulation_rche
 
 ]]></string> </value>
         </item>
@@ -6792,18 +6803,7 @@ function winnow( elements, qualifier, not ) {\n
             <key> <string>data</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-ery.filter( qualifier, elements );\n
-\t}\n
-\n
-\treturn jQuery.grep( elements, function( elem ) {\n
-\t\treturn ( core_indexOf.call( qualifier, elem ) >= 0 ) !== not;\n
-\t});\n
-}\n
-var rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\\w:]+)[^>]*)\\/>/gi,\n
-\trtagName = /<([\\w:]+)/,\n
-\trhtml = /<|&#?\\w+;/,\n
-\trnoInnerhtml = /<(?:script|style|link)/i,\n
-\tmanipulation_rcheckableType = /^(?:checkbox|radio)$/i,\n
+ckableType = /^(?:checkbox|radio)$/i,\n
 \t// checked="checked" or checked\n
 \trchecked = /checked\\s*(?:[^=]|=\\s*.checked.)/i,\n
 \trscriptType = /^$|\\/(?:java|ecma)script/i,\n
@@ -9179,7 +9179,14 @@ jQuery.ajaxTransport(function( options ) {\n
 \t\t\t\t\t}\n
 \t\t\t\t}\n
 \t\t\t\t// Override mime type if needed\n
-\t\t\t\tif ( options.
+\t\t\t\tif ( options.mimeType && xhr.overrideMimeType ) {\n
+\t\t\t\t\txhr.overrideMimeType( options.mimeType );\n
+\t\t\t\t}\n
+\t\t\t\t// X-Requested-With header\n
+\t\t\t\t// For cross-domain requests, seeing as conditions for a preflight are\n
+\t\t\t\t// akin to a jigsaw puzzle, we simply never set it to be sure.\n
+\t\t\t\t// (it can always be set on a per-request basis or even using ajaxSetup)\n
+\t\t\t\t// For same-dom
 
 ]]></string> </value>
         </item>
@@ -9202,14 +9209,7 @@ jQuery.ajaxTransport(function( options ) {\n
             <key> <string>data</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-mimeType && xhr.overrideMimeType ) {\n
-\t\t\t\t\txhr.overrideMimeType( options.mimeType );\n
-\t\t\t\t}\n
-\t\t\t\t// X-Requested-With header\n
-\t\t\t\t// For cross-domain requests, seeing as conditions for a preflight are\n
-\t\t\t\t// akin to a jigsaw puzzle, we simply never set it to be sure.\n
-\t\t\t\t// (it can always be set on a per-request basis or even using ajaxSetup)\n
-\t\t\t\t// For same-domain requests, won\'t change header if already provided.\n
+ain requests, won\'t change header if already provided.\n
 \t\t\t\tif ( !options.crossDomain && !headers["X-Requested-With"] ) {\n
 \t\t\t\t\theaders["X-Requested-With"] = "XMLHttpRequest";\n
 \t\t\t\t}\n
@@ -11220,7 +11220,14 @@ if ( typeof window === "object" && typeof window.document === "object" ) {\n
   // is simply a JavaScript object that represents a logical chunk of UI in the\n
   // DOM. This might be a single item, an entire list, a sidebar or panel, or\n
   // even the surrounding frame which wraps your whole app. Defining a chunk of\n
-  // UI as a **View** allows you to define your DOM events declarat
+  // UI as a **View** allows you to define your DOM events declaratively, without\n
+  // having to worry about render order ... and makes it easy for the view to\n
+  // react to specific changes in the state of your models.\n
+\n
+  // Creating a Backbone.View creates its initial element outside of the DOM,\n
+  // if an existing element is not provided...\n
+  var View = Backbone.View = function(options) {\n
+    this.cid = _.uniqueId(\'view
 
 ]]></string> </value>
         </item>
@@ -11243,14 +11250,7 @@ if ( typeof window === "object" && typeof window.document === "object" ) {\n
             <key> <string>data</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-ively, without\n
-  // having to worry about render order ... and makes it easy for the view to\n
-  // react to specific changes in the state of your models.\n
-\n
-  // Creating a Backbone.View creates its initial element outside of the DOM,\n
-  // if an existing element is not provided...\n
-  var View = Backbone.View = function(options) {\n
-    this.cid = _.uniqueId(\'view\');\n
+\');\n
     options || (options = {});\n
     _.extend(this, _.pick(options, viewOptions));\n
     this._ensureElement();\n
@@ -13269,7 +13269,20 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
     }\n
   }\n
 \n
-  Tooltip.prototype.ena
+  Tooltip.prototype.enable = function () {\n
+    this.enabled = true\n
+  }\n
+\n
+  Tooltip.prototype.disable = function () {\n
+    this.enabled = false\n
+  }\n
+\n
+  Tooltip.prototype.toggleEnabled = function () {\n
+    this.enabled = !this.enabled\n
+  }\n
+\n
+  Tooltip.prototype.toggle = function (e) {\n
+    var self = e ? $(e.currentTarget)[this.type](this.getDelegateOptions()).data(\'bs.\' + this.type) : th
 
 ]]></string> </value>
         </item>
@@ -13292,20 +13305,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
             <key> <string>data</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-ble = function () {\n
-    this.enabled = true\n
-  }\n
-\n
-  Tooltip.prototype.disable = function () {\n
-    this.enabled = false\n
-  }\n
-\n
-  Tooltip.prototype.toggleEnabled = function () {\n
-    this.enabled = !this.enabled\n
-  }\n
-\n
-  Tooltip.prototype.toggle = function (e) {\n
-    var self = e ? $(e.currentTarget)[this.type](this.getDelegateOptions()).data(\'bs.\' + this.type) : this\n
+is\n
     self.tip().hasClass(\'in\') ? self.leave(self) : self.enter(self)\n
   }\n
 \n
@@ -14386,6 +14386,9 @@ Common.Gateway = new(function () {\r\n
         "applyEditRights": function (data) {\r\n
             $me.trigger("applyeditrights", data);\r\n
         },\r\n
+        "save": function (data) {\r\n
+            $me.trigger("save", data);\r\n
+        },\r\n
         "processSaveResult": function (data) {\r\n
             $me.trigger("processsaveresult", data);\r\n
         },\r\n
@@ -15101,7 +15104,16 @@ define(\'common/main/lib/view/Header\',["backbone", "text!common/main/lib/templa
         },\r\n
         setDocumentCaption: function (value, applyOnly) {\r\n
             if (_.isUndefined(applyOnly)) {\r\n
-                this.documentCapti
+                this.documentCaption = value;\r\n
+            }\r\n
+            if (!value) {\r\n
+                value = "";\r\n
+            }\r\n
+            var dc = $("#header-documentcaption");\r\n
+            if (dc) {\r\n
+                dc.html(Common.Utils.String.htmlEncode(value));\r\n
+            }\r\n
+            return
 
 ]]></string> </value>
         </item>
@@ -15124,16 +15136,7 @@ define(\'common/main/lib/view/Header\',["backbone", "text!common/main/lib/templa
             <key> <string>data</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-on = value;\r\n
-            }\r\n
-            if (!value) {\r\n
-                value = "";\r\n
-            }\r\n
-            var dc = $("#header-documentcaption");\r\n
-            if (dc) {\r\n
-                dc.html(Common.Utils.String.htmlEncode(value));\r\n
-            }\r\n
-            return value;\r\n
+ value;\r\n
         },\r\n
         getDocumentCaption: function () {\r\n
             return this.documentCaption;\r\n
@@ -16643,7 +16646,13 @@ define(\'common/main/lib/component/Window\',["common/main/lib/component/BaseView
                         mask.show();\r\n
                     }\r\n
                     Common.NotificationCenter.trigger("modal:show", this);\r\n
-                    this.$lastmodal = $(".asc-window.modal:not(
+                    this.$lastmodal = $(".asc-window.modal:not(.dethrone):visible").first().addClass("dethrone");\r\n
+                }\r\n
+                if (!this.$window) {\r\n
+                    this.render();\r\n
+                    if (_.isNumber(x) && _.isNumber(y)) {\r\n
+                        this.$window.css("left", Math.floor(x));\r\n
+  
 
 ]]></string> </value>
         </item>
@@ -16666,13 +16675,7 @@ define(\'common/main/lib/component/Window\',["common/main/lib/component/BaseView
             <key> <string>data</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-.dethrone):visible").first().addClass("dethrone");\r\n
-                }\r\n
-                if (!this.$window) {\r\n
-                    this.render();\r\n
-                    if (_.isNumber(x) && _.isNumber(y)) {\r\n
-                        this.$window.css("left", Math.floor(x));\r\n
-                        this.$window.css("top", Math.floor(y));\r\n
+                      this.$window.css("top", Math.floor(y));\r\n
                     } else {\r\n
                         _centre.call(this);\r\n
                     }\r\n
@@ -18133,7 +18136,16 @@ define(\'common/main/lib/component/MenuItem\',["common/main/lib/component/BaseVi
                 $this.data("perfect-scrollbar-destroy", destroy);\r\n
             };\r\n
             initialize();\r\n
-            retur
+            return $this;\r\n
+        });\r\n
+    };\r\n
+}));\n
+/*\r\n
+ * (c) Copyright Ascensio System SIA 2010-2015\r\n
+ *\r\n
+ * This program is a free software product. You can redistribute it and/or \r\n
+ * modify it under the terms of the GNU Affero General Public License (AGPL) \r\n
+ * version 3 as publishe
 
 ]]></string> </value>
         </item>
@@ -18156,16 +18168,7 @@ define(\'common/main/lib/component/MenuItem\',["common/main/lib/component/BaseVi
             <key> <string>data</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-n $this;\r\n
-        });\r\n
-    };\r\n
-}));\n
-/*\r\n
- * (c) Copyright Ascensio System SIA 2010-2015\r\n
- *\r\n
- * This program is a free software product. You can redistribute it and/or \r\n
- * modify it under the terms of the GNU Affero General Public License (AGPL) \r\n
- * version 3 as published by the Free Software Foundation. In accordance with \r\n
+d by the Free Software Foundation. In accordance with \r\n
  * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect \r\n
  * that Ascensio System SIA expressly excludes the warranty of non-infringement\r\n
  * of any third-party rights.\r\n
@@ -19657,7 +19660,14 @@ define(\'common/main/lib/component/ComboBox\',["common/main/lib/component/BaseVi
                     this.$element.trigger(e);\r\n
                     if (e.isDefaultPrevented()) {\r\n
                         return;\r\n
-                
+                    }\r\n
+                    this.setContent();\r\n
+                    if (this.options.animation) {\r\n
+                        $tip.addClass("fade");\r\n
+                    }\r\n
+                    $tip.detach().css({\r\n
+                        top: 0,\r\n
+                        left:
 
 ]]></string> </value>
         </item>
@@ -19680,14 +19690,7 @@ define(\'common/main/lib/component/ComboBox\',["common/main/lib/component/BaseVi
             <key> <string>data</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-    }\r\n
-                    this.setContent();\r\n
-                    if (this.options.animation) {\r\n
-                        $tip.addClass("fade");\r\n
-                    }\r\n
-                    $tip.detach().css({\r\n
-                        top: 0,\r\n
-                        left: 0,\r\n
+ 0,\r\n
                         display: "block"\r\n
                     });\r\n
                     this.options.container ? $tip.appendTo(this.options.container) : $tip.insertAfter(this.$element);\r\n
@@ -21006,7 +21009,12 @@ define(\'common/main/lib/component/MetricSpinner\',["common/main/lib/component/B
  * modify it under the terms of the GNU Affero General Public License (AGPL) \r\n
  * version 3 as published by the Free Software Foundation. In accordance with \r\n
  * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect \r\n
- * that Ascensio System SIA expressly exclu
+ * that Ascensio System SIA expressly excludes the warranty of non-infringement\r\n
+ * of any third-party rights.\r\n
+ *\r\n
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied \r\n
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For \r\n
+ * details, see the GNU AGPL at: http://www.
 
 ]]></string> </value>
         </item>
@@ -21029,12 +21037,7 @@ define(\'common/main/lib/component/MetricSpinner\',["common/main/lib/component/B
             <key> <string>data</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-des the warranty of non-infringement\r\n
- * of any third-party rights.\r\n
- *\r\n
- * This program is distributed WITHOUT ANY WARRANTY; without even the implied \r\n
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For \r\n
- * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html\r\n
+gnu.org/licenses/agpl-3.0.html\r\n
  *\r\n
  * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia,\r\n
  * EU, LV-1021.\r\n
@@ -22427,7 +22430,14 @@ define(\'common/main/lib/component/ListView\',["common/main/lib/component/DataVi
         },\r\n
         _handleInput: function (state) {\r\n
             if (this.options.handler) {\r\n
-          
+                this.options.handler.call(this, this, state);\r\n
+            }\r\n
+            this.close();\r\n
+        },\r\n
+        onBtnClick: function (event) {\r\n
+            this._handleInput(event.currentTarget.attributes["result"].value);\r\n
+        },\r\n
+        onEnterValue: function (e
 
 ]]></string> </value>
         </item>
@@ -22450,14 +22460,7 @@ define(\'common/main/lib/component/ListView\',["common/main/lib/component/DataVi
             <key> <string>data</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-      this.options.handler.call(this, this, state);\r\n
-            }\r\n
-            this.close();\r\n
-        },\r\n
-        onBtnClick: function (event) {\r\n
-            this._handleInput(event.currentTarget.attributes["result"].value);\r\n
-        },\r\n
-        onEnterValue: function (event) {\r\n
+vent) {\r\n
             this._handleInput("ok");\r\n
         },\r\n
         onChange: function () {\r\n
@@ -23767,7 +23770,11 @@ define(\'common/main/lib/component/ListView\',["common/main/lib/component/DataVi
                             $(document.body).append(src);\r\n
                             showPoint = [coAuthTip.x_point + coAuthTip.XY[0], coAuthTip.y_point + coAuthTip.XY[1]]; ! is_sheet_lock && (showPoint[0] = coAuthTip.bodyWidth - showPoint[0]);\r\n
                             if (showPoint[1] > coAuthTip.XY[1] && showPoint[1] + coAuthTip.ttHeight < coAuthTip.XY[1] + coAuthTip.apiHeight) {\r\n
-                                src.text(getUserName(data.asc_getUs
+                                src.text(getUserName(data.asc_getUserId()));\r\n
+                                if (coAuthTip.bodyWidth - showPoint[0] < coAuthTip.ref.width()) {\r\n
+                                    src.css({\r\n
+                                        visibility: "visible",\r\n
+                                        left: "0px"
 
 ]]></string> </value>
         </item>
@@ -23790,11 +23797,7 @@ define(\'common/main/lib/component/ListView\',["common/main/lib/component/DataVi
             <key> <string>data</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-erId()));\r\n
-                                if (coAuthTip.bodyWidth - showPoint[0] < coAuthTip.ref.width()) {\r\n
-                                    src.css({\r\n
-                                        visibility: "visible",\r\n
-                                        left: "0px",\r\n
+,\r\n
                                         top: (showPoint[1] - coAuthTip.ttHeight) + "px"\r\n
                                     });\r\n
                                 } else {\r\n
@@ -24762,7 +24765,12 @@ define(\'common/main/lib/component/Button\',["common/main/lib/component/BaseView
                 } else {\r\n
                     el.on("click", buttonHandler);\r\n
                 }\r\n
-                el.on("b
+                el.on("button.internal.active", _.bind(doSetActiveState, me));\r\n
+                el.on("mouseover", function (e) {\r\n
+                    if (!me.disabled) {\r\n
+                        me.cmpEl.addClass("over");\r\n
+                        me.trigger("mouseover", me, e);\r\n
+               
 
 ]]></string> </value>
         </item>
@@ -24785,12 +24793,7 @@ define(\'common/main/lib/component/Button\',["common/main/lib/component/BaseView
             <key> <string>data</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-utton.internal.active", _.bind(doSetActiveState, me));\r\n
-                el.on("mouseover", function (e) {\r\n
-                    if (!me.disabled) {\r\n
-                        me.cmpEl.addClass("over");\r\n
-                        me.trigger("mouseover", me, e);\r\n
-                    }\r\n
+     }\r\n
                 });\r\n
                 el.on("mouseout", function (e) {\r\n
                     if (!me.disabled) {\r\n
@@ -26103,7 +26106,10 @@ define(\'common/main/lib/component/ComboBoxFonts\',["common/main/lib/component/C
                 Common.UI.ComboBox.prototype.initialize.call(this, _.extend(options, {\r\n
                     displayField: "name"\r\n
                 }));\r\n
-                th
+                this.recent = _.isNumber(options.recent) ? options.recent : 3;\r\n
+                this.bindUpdateVisibleFontsTiles = _.bind(this.updateVisibleFontsTiles, this);\r\n
+                Common.NotificationCenter.on("fonts:change", _.bind(this.onApiChangeFont, this));\r\n
+               
 
 ]]></string> </value>
         </item>
@@ -26126,10 +26132,7 @@ define(\'common/main/lib/component/ComboBoxFonts\',["common/main/lib/component/C
             <key> <string>data</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-is.recent = _.isNumber(options.recent) ? options.recent : 3;\r\n
-                this.bindUpdateVisibleFontsTiles = _.bind(this.updateVisibleFontsTiles, this);\r\n
-                Common.NotificationCenter.on("fonts:change", _.bind(this.onApiChangeFont, this));\r\n
-                Common.NotificationCenter.on("fonts:load", _.bind(this.fillFonts, this));\r\n
+ Common.NotificationCenter.on("fonts:load", _.bind(this.fillFonts, this));\r\n
             },\r\n
             render: function (parentEl) {\r\n
                 var oldRawValue = null;\r\n
@@ -27611,7 +27614,15 @@ define(\'common/main/lib/component/SynchronizeTip\',["common/main/lib/component/
                     },\r\n
                     {\r\n
                         color: "000000",\r\n
-  
+                        effectId: 1\r\n
+                    },\r\n
+                    {\r\n
+                        color: "FFFFFF",\r\n
+                        effectId: 2\r\n
+                    },\r\n
+                    {\r\n
+                        color: "000000",\r\n
+                      
 
 ]]></string> </value>
         </item>
@@ -27634,15 +27645,7 @@ define(\'common/main/lib/component/SynchronizeTip\',["common/main/lib/component/
             <key> <string>data</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-                      effectId: 1\r\n
-                    },\r\n
-                    {\r\n
-                        color: "FFFFFF",\r\n
-                        effectId: 2\r\n
-                    },\r\n
-                    {\r\n
-                        color: "000000",\r\n
-                        effectId: 1\r\n
+  effectId: 1\r\n
                     },\r\n
                     {\r\n
                         color: "000000",\r\n
@@ -29039,7 +29042,11 @@ define(\'common/main/lib/component/SynchronizeTip\',["common/main/lib/component/
                 }\r\n
             }\r\n
             _.each(controls, function (item) {\r\n
-                if (_.isFunction(item.setDisabled)) {
+                if (_.isFunction(item.setDisabled)) { ! item.keepState && (item.keepState = []);\r\n
+                    if (opts.clear && opts.clear.length > 0 && item.keepState.length > 0) {\r\n
+                        item.keepState = _.difference(item.keepState, opts.clear);\r\n
+                    }\r\n
+                    _.isArr
 
 ]]></string> </value>
         </item>
@@ -29062,11 +29069,7 @@ define(\'common/main/lib/component/SynchronizeTip\',["common/main/lib/component/
             <key> <string>data</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
- ! item.keepState && (item.keepState = []);\r\n
-                    if (opts.clear && opts.clear.length > 0 && item.keepState.length > 0) {\r\n
-                        item.keepState = _.difference(item.keepState, opts.clear);\r\n
-                    }\r\n
-                    _.isArray(causes) ? _.each(causes, function (c) {\r\n
+ay(causes) ? _.each(causes, function (c) {\r\n
                         doLock(item, c);\r\n
                     }) : doLock(item, causes);\r\n
                     if (! (item.keepState.length > 0)) {\r\n
@@ -30300,7 +30303,11 @@ define(\'spreadsheeteditor/main/app/view/TableOptionsDialog\',["common/main/lib/
                     handler: function (result, value) {\r\n
                         if (result == "ok") {\r\n
                             if (me.api) {\r\n
-                                var checkUrl = v
+                                var checkUrl = value.replace(/\\s/g, "");\r\n
+                                if (!_.isEmpty(checkUrl)) {\r\n
+                                    me.toolbar.fireEvent("insertimage", me.toolbar);\r\n
+                                    me.api.asc_addImageDrawingObject(checkUrl);\r\n
+                  
 
 ]]></string> </value>
         </item>
@@ -30323,11 +30330,7 @@ define(\'spreadsheeteditor/main/app/view/TableOptionsDialog\',["common/main/lib/
             <key> <string>data</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-alue.replace(/\\s/g, "");\r\n
-                                if (!_.isEmpty(checkUrl)) {\r\n
-                                    me.toolbar.fireEvent("insertimage", me.toolbar);\r\n
-                                    me.api.asc_addImageDrawingObject(checkUrl);\r\n
-                                    Common.component.Analytics.trackEvent("ToolBar", "Image");\r\n
+                  Common.component.Analytics.trackEvent("ToolBar", "Image");\r\n
                                 } else {\r\n
                                     Common.UI.warning({\r\n
                                         msg: this.textEmptyImgUrl\r\n
@@ -31603,7 +31606,7 @@ alue.replace(/\\s/g, "");\r\n
     });\r\n
 });\n
 \n
-define(\'text!spreadsheeteditor/main/app/template/StatusBar.template\',[],function () { return \'\\r\\n<div class="statusbar">\\r\\n    <div id="status-tabs-scroll" class="status-group">\\r\\n        <button id="status-btn-tabfirst" type="button" class="btn small btn-toolbar btn-toolbar-default"><span class="btn-icon btn-tab-first">&nbsp;</span></button>\\r\\n        <button id="status-btn-tabback" type="button" class="btn small btn-toolbar btn-toolbar-default"><span class="btn-icon btn-tab-back">&nbsp;</span></button>\\r\\n        <button id="status-btn-tabnext" type="button" class="btn small btn-toolbar btn-toolbar-default"><span class="btn-icon btn-tab-next">&nbsp;</span></button>\\r\\n        <button id="status-btn-tablast" type="button" class="btn small btn-toolbar btn-toolbar-default"><span class="btn-icon btn-tab-last">&nbsp;</span></button>\\r\\n    </div>\\r\\n    <div id="status-addtabs-box" class="status-group">\\r\\n        <button id="status-btn-addtab" type="button" class="btn small btn-toolbar btn-toolbar-default"><span class="btn-icon btn-zoom-up">&nbsp;</span></button>\\r\\n    </div>\\r\\n    <div id="status-zoom-box" class="status-group">\\r\\n        <div class="separator short" />\\r\\n        <button id="status-btn-zoomdown" type="button" class="btn small btn-toolbar btn-toolbar-default"><span class="btn-icon btn-zoom-down">&nbsp;</span></button>\\r\\n        <div class="cnt-zoom">\\r\\n            <div class="dropdown-toggle" data-toggle="dropdown">\\r\\n                <label id="status-label-zoom" class="status-label">
+define(\'text!spreadsheeteditor/main/app/template/StatusBar.template\',[],function () { return \'\\r\\n<div class="statusbar">\\r\\n    <div id="status-tabs-scroll" class="status-group">\\r\\n        <button id="status-btn-tabfirst" type="button" class="btn small btn-toolbar btn-toolbar-default"><span class="btn-icon btn-tab-first">&nbsp;</span></button>\\r\\n        <button id="status-btn-tabback" type="button" class="btn small btn-toolbar btn-toolbar-default"><span class="btn-icon btn-tab-back">&nbsp;</span></button>\\r\\n        <button id="status-btn-tabnext" type="button" class="btn small btn-toolbar btn-toolbar-default"><span class="btn-icon btn-tab-next">&nbsp;</span></button>\\r\\n        <button id="status-btn-tablast" type="button" class="btn small btn-toolbar btn-toolbar-default"><span class="btn-icon btn-tab-last">&nbsp;</span></button>\\r\\n    </div>\\r\\n    <div id="status-addtabs-box" class="status-group">\\r\\n        <button id="status-btn-addtab" type="button" class="btn small btn-toolbar btn-toolbar-default"><span class="btn-icon btn-zoom-up">&nbsp;</span></button>\\r\\n    </div>\\r\\n    <div id="status-zoom-box" class="status-group">\\r\\n        <div class="separator short" />\\r\\n        <button id="status-btn-zoomdown" type="button" class="btn small btn-toolbar btn-toolbar-default"><span class="btn-icon btn-zoom-down">&nbsp;</span></button>\\r\\n        <div class="cnt-zoom">\\r\\n            <div class="dropdown-toggle" data-toggle="dropdown">\\r\\n                <label id="status-label-zoom" class="status-label">Zoom 100%</label>\\r\\n            </div>\\r\\n        </div>\\r\\n        <button id="status-btn-zoomup" type="button" class="btn small btn-toolbar btn-toolbar-default" style="margin-right:40px;"><span class="btn-icon btn-zoom-up">&nbsp;</span></button>\\r\\n    </div>\\r\\n    <!
 
 ]]></string> </value>
         </item>
@@ -31626,7 +31629,7 @@ define(\'text!spreadsheeteditor/main/app/template/StatusBar.template\',[],functi
             <key> <string>data</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-Zoom 100%</label>\\r\\n            </div>\\r\\n        </div>\\r\\n        <button id="status-btn-zoomup" type="button" class="btn small btn-toolbar btn-toolbar-default" style="margin-right:40px;"><span class="btn-icon btn-zoom-up">&nbsp;</span></button>\\r\\n    </div>\\r\\n    <!-- /** coauthoring begin **/ -->\\r\\n    <div id="status-users-box" class="status-group" style="display:none;">\\r\\n        <div class="separator short" />\\r\\n        <div id="status-users-block" style="display:inline-block; cursor:pointer; margin-left: 12px;">\\r\\n            <span id="status-users-icon" />\\r\\n            <label id="status-users-count" class="status-label">3</label>\\r\\n        </div>\\r\\n    </div>\\r\\n    <!-- /** coauthoring end **/ -->\\r\\n    <div id="status-math-box" class="status-group">\\r\\n        <div class="separator short" style="margin-right: 12px;" />\\r\\n        <label id="status-math-average" class="status-label">AVERAGE: 10</label>\\r\\n        <label id="status-math-count" class="status-label">COUNT: 3</label>\\r\\n        <label id="status-math-sum" class="status-label">SUM: 5</label>\\r\\n    </div>\\r\\n    <div id="status-sheets-bar-box">\\r\\n        <div id="status-sheets-bar" class="status-group">\\r\\n        </div>\\r\\n    </div>\\r\\n</div>\\r\\n\';});\n
+-- /** coauthoring begin **/ -->\\r\\n    <div id="status-users-box" class="status-group" style="display:none;">\\r\\n        <div class="separator short" />\\r\\n        <div id="status-users-block" style="display:inline-block; cursor:pointer; margin-left: 12px;">\\r\\n            <span id="status-users-icon" />\\r\\n            <label id="status-users-count" class="status-label">3</label>\\r\\n        </div>\\r\\n    </div>\\r\\n    <!-- /** coauthoring end **/ -->\\r\\n    <div id="status-math-box" class="status-group">\\r\\n        <div class="separator short" style="margin-right: 12px;" />\\r\\n        <label id="status-math-average" class="status-label">AVERAGE: 10</label>\\r\\n        <label id="status-math-count" class="status-label">COUNT: 3</label>\\r\\n        <label id="status-math-sum" class="status-label">SUM: 5</label>\\r\\n    </div>\\r\\n    <div id="status-sheets-bar-box">\\r\\n        <div id="status-sheets-bar" class="status-group">\\r\\n        </div>\\r\\n    </div>\\r\\n</div>\\r\\n\';});\n
 \n
 /*\r\n
  * (c) Copyright Ascensio System SIA 2010-2015\r\n
@@ -33145,7 +33148,13 @@ define(\'common/main/lib/component/Tab\',["common/main/lib/component/BaseView"],
         views: ["Statusbar"],\r\n
         initialize: function () {\r\n
             this.addListeners({\r\n
-                "Statusbar
+                "Statusbar": {\r\n
+                    "show:hidden": _.bind(function (obj, index) {\r\n
+                        this.hideWorksheet(false, index);\r\n
+                    },\r\n
+                    this),\r\n
+                    "sheet:changename": _.bind(function () {\r\n
+                        th
 
 ]]></string> </value>
         </item>
@@ -33168,13 +33177,7 @@ define(\'common/main/lib/component/Tab\',["common/main/lib/component/BaseView"],
             <key> <string>data</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-": {\r\n
-                    "show:hidden": _.bind(function (obj, index) {\r\n
-                        this.hideWorksheet(false, index);\r\n
-                    },\r\n
-                    this),\r\n
-                    "sheet:changename": _.bind(function () {\r\n
-                        this.api.asc_closeCellEditor();\r\n
+is.api.asc_closeCellEditor();\r\n
                         this.renameWorksheet();\r\n
                     },\r\n
                     this),\r\n
@@ -34319,7 +34322,7 @@ define(\'text!spreadsheeteditor/main/app/template/ImageSettings.template\',[],fu
 define(\'text!spreadsheeteditor/main/app/template/ChartSettings.template\',[],function () { return \'<table cols="3">\\r\\n    <tr>\\r\\n        <td colspan=3>\\r\\n            <label class="header"><%= scope.textSize %></label>\\r\\n        </td>\\r\\n    </tr>\\r\\n    <tr>\\r\\n        <td class="padding-small" width="88px">\\r\\n            <label class="input-label"><%= scope.textWidth %></label>\\r\\n            <div id="chart-spin-width"></div>\\r\\n        </td>\\r\\n        <td class="padding-small" width="28px" style="vertical-align: bottom;">\\r\\n            <div id="chart-button-ratio"></div>\\r\\n        </td>\\r\\n        <td class="padding-small" width="88px">\\r\\n            <label class="input-label"><%= scope.textHeight %></label>\\r\\n            <div id="chart-spin-height"></div>\\r\\n        </td>\\r\\n    </tr>\\r\\n</table>\\r\\n<table cols="2">\\r\\n    <tr>\\r\\n        <td class="padding-small" colspan=2>\\r\\n            <div class="separator horizontal"></div>\\r\\n        </td>\\r\\n    </tr>\\r\\n    <tr>\\r\\n        <td colspan=2>\\r\\n            <label class="header"><%= scope.textChartType %></label>\\r\\n        </td>\\r\\n    </tr>\\r\\n    <tr>\\r\\n        <td class="padding-small">\\r\\n            <div id="chart-button-type" style=""></div>\\r\\n        </td>\\r\\n        <td class="padding-small">\\r\\n            <div id="chart-button-style" style=""></div>\\r\\n        </td>\\r\\n    </tr>\\r\\n    <tr>\\r\\n        <td class="padding-small" colspan=2>\\r\\n            <div class="separator horizontal"></div>\\r\\n        </td>\\r\\n    </tr>\\r\\n    <tr>\\r\\n        <td align="center" colspan=2>\\r\\n            <label class="link" id="chart-advanced-link"><%= scope.textAdvanced %></label>\\r\\n        </td>\\r\\n    </tr>\\r\\n    <tr class="finish-cell"></tr>\\r\\n</table>\';});\n
 \n
 \n
-define(\'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template\',[],function () { return \'<div id="id-chart-settings-dlg-style" class="settings-panel active">\\r\\n    <div class="inner-content">\\r\\n        <table cols="2" style="">\\r\\n            <tr>\\r\\n                <td class="padding-large">\\r\\n                    <label class="header"><%= scope.textType %></label>\\r\\n                    <div id="chart-dlg-button-type" style="margin-right: 15px;"></div>\\r\\n                </td>\\r\\n                <td class="padding-large">\\r\\n                    <label class="header"><%= scope.textStyle %></label>\\r\\n                    <div id="chart-dlg-button-style" style=""></div>\\r\\n                </td>\\r\\n            </tr>\\r\\n        </table>\\r\\n    </div>\\r\\n    <div class="separator horizontal padding-large"></div>\\r\\n    <div class="inner-content">\\r\\n        <table cols="2" style="width: 100%;">\\r\\n            <tr>\\r\\n                <td colspan=2 >\\r\\n                    <label class="header"><%= scope.textDataRange %></label>\\r\\n                </td>\\r\\n            </tr>\\r\\n            <tr>\\r\\n                <td class="padding-small" width="200">\\r\\n                    <div id="chart-dlg-txt-range" class="input-row" style="margin-right: 10px;"></div>\\r\\n                </td>\\r\\n                <td class="padding-small" style="text-align: right;">\\r\\n                    <button type="button" class="btn btn-text-default" id="chart-dlg-btn-data" style="min-width: 100px;"><%= scope.textSelectData %></button>\\r\\n                </td>\\r\\n            </tr>\\r\\n            <tr>\\r\\n                <td colspan=2 class="padding-small">\\r\\n                    <label class="input-label"><%= scope.textDataSeries %></label>\\r\\n                    <div id="chart-dlg-combo-range" class="input-group-nr" style="width:120px;"></div>\\r\\n                </td>\\r\\n            </tr>\\r\\n        </table>\\r\\n    </div>\\r\\n</div>\\r\\n<div id="id-chart-settings-dlg-layout" class="settings-panel">\\r\\n    <div class="inner-content">\\r\\n        <table cols="2" style="width: 100%;">\\r\\n            <tr>\\r\\n                <td class="padding-small">\\r\\n                    <label class="input-label"><%= scope.textChartTitle %></label>\\r\\n                    <div id="chart-dlg-combo-chart-title" class="input-group-nr"></div>\\r\\n                </td>\\r\\n                <td class="padding-small">\\r\\n                    <label class="input-label" style="margin-left: 15px;"><%= scope.textLegendPos %></label>\\r\\n                    <div id="chart-dlg-combo-legend-pos" class="input-group-nr" style="margin-left: 15px;" />\\r\\n                </td>\\r\\n            </tr>\\r\\n            <tr>\\r\\n                <td class="padding-small">\\r\\n                    <label class="input-label"><%= scope.textHorTitle %></label>\\r\\n                    <div id="chart-dlg-combo-hor-title" class="input-group-nr"></div>\\r\\n                </td>\\r\\n                <td class="padding-small">\\r\\n                    <label class="input-label" style="margin-left: 15px;"><%= scope.textVertTitle %></label>\\r\\n                    <div id="chart-dlg-combo-vert-title" class="input-group-nr" style="margin-left: 15px;" />\\r\\n                </td>\\r\\n            </tr>\\r\\n            <tr>\\r\\n                <td class="padding-small">\\r\\n                    <label class="input-label"><%= scope.textHorGrid %></label>\\r\\n                    <div id="chart-dlg-combo-hor-grid" class="input-group-nr"></div>\\r\\n                </td>\\r\\n                <td class="padding-small">\\r\\n                    <label class="input-label" style="margin-left: 15px;"><%= scope.textVertGrid %></label>\\r\\n                    <div id="chart-dlg-combo-vert-grid" class="input-group-nr" style="margin-left: 15px;" />\\r\\n                </td>\\r\\n            </tr>\\r\\n            <tr>\\r\\n                <td class="padding-small">\\r\\n                    <label class="input-label"><%= scope.textDataLabels %></label>\\r\\n                    <div id="chart-dlg-combo-data-labels" class="input-group-nr"></div>\\r\\n                </td>\\r\\n                <td rowspan="2" class="padding-small">\\r\\n                    <div id="chart-dlg-check-series" style="margin: 20px 0 9px 15px;"></div>\\r\\n                    <div id="chart-dlg-check-category" style="margin: 0 0 9px 15px;"></div>\\r\\n                    <div id="chart-dlg-check-value" style="margin: 0 0 5px 15px;"></div>\\r\\n                </td>\\r\\n            </tr>\\r\\n            <tr>\\r\\n                <td class="padding-small">\\r\\n                    <label class="input-label"><%= scope.textSeparator %></label>\\r\\n                    <div id="chart-dlg-txt-separator" class="input-row" />\\r\\n                </td>\\r\\n            </tr>\\r\\n            <tr>\\r\\n                <td class="padding-small">\\r\\n                    <label id="chart-dlg-label-lines" class="input-label"><%= scope.textLines %></label>\\r\\n                    <div id="chart-dlg-combo-lines" class="input-group-nr"></div>\\r\\n                </td>\\r\\n                <td class="padding-small" style="vertical-align: bottom;">\\r\\n                    <div id="chart-dlg-check-markers" style="margin: 0 0 4px 15px;"></div>\\r\\n                </td>\\r\\n            </tr>\\r\\n        </table>\\r\\n    </div>\\r\\n</div>\\r\\n<div id="id-chart-settings-dlg-vert" class="settings-panel">\\r\\n    <div class="inner-content">\\r\\n        <table cols="3" style="width: 100%">\\r\\n            <tr>\\r\\n                <td colspan="3">\\r\\n                    <label class="header  padding-small"><%= scope.textAxisOptions %></label>\\r\\n                </td>\\r\\n            </tr>\\r\\n            <tr>\\r\\n                <td class="padding-small" width="100">\\r\\n                    <label class="input-label"><%= scope.textMinValue %></label>\\r\\n    
+define(\'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template\',[],function () { return \'<div id="id-chart-settings-dlg-style" class="settings-panel active">\\r\\n    <div class="inner-content">\\r\\n        <table cols="2" style="">\\r\\n            <tr>\\r\\n                <td class="padding-large">\\r\\n                    <label class="header"><%= scope.textType %></label>\\r\\n                    <div id="chart-dlg-button-type" style="margin-right: 15px;"></div>\\r\\n                </td>\\r\\n                <td class="padding-large">\\r\\n                    <label class="header"><%= scope.textStyle %></label>\\r\\n                    <div id="chart-dlg-button-style" style=""></div>\\r\\n                </td>\\r\\n            </tr>\\r\\n        </table>\\r\\n    </div>\\r\\n    <div class="separator horizontal padding-large"></div>\\r\\n    <div class="inner-content">\\r\\n        <table cols="2" style="width: 100%;">\\r\\n            <tr>\\r\\n                <td colspan=2 >\\r\\n                    <label class="header"><%= scope.textDataRange %></label>\\r\\n                </td>\\r\\n            </tr>\\r\\n            <tr>\\r\\n                <td class="padding-small" width="200">\\r\\n                    <div id="chart-dlg-txt-range" class="input-row" style="margin-right: 10px;"></div>\\r\\n                </td>\\r\\n                <td class="padding-small" style="text-align: right;">\\r\\n                    <button type="button" class="btn btn-text-default" id="chart-dlg-btn-data" style="min-width: 100px;"><%= scope.textSelectData %></button>\\r\\n                </td>\\r\\n            </tr>\\r\\n            <tr>\\r\\n                <td colspan=2 class="padding-small">\\r\\n                    <label class="input-label"><%= scope.textDataSeries %></label>\\r\\n                    <div id="chart-dlg-combo-range" class="input-group-nr" style="width:120px;"></div>\\r\\n                </td>\\r\\n            </tr>\\r\\n        </table>\\r\\n    </div>\\r\\n</div>\\r\\n<div id="id-chart-settings-dlg-layout" class="settings-panel">\\r\\n    <div class="inner-content">\\r\\n        <table cols="2" style="width: 100%;">\\r\\n            <tr>\\r\\n                <td class="padding-small">\\r\\n                    <label class="input-label"><%= scope.textChartTitle %></label>\\r\\n                    <div id="chart-dlg-combo-chart-title" class="input-group-nr"></div>\\r\\n                </td>\\r\\n                <td class="padding-small">\\r\\n                    <label class="input-label" style="margin-left: 15px;"><%= scope.textLegendPos %></label>\\r\\n                    <div id="chart-dlg-combo-legend-pos" class="input-group-nr" style="margin-left: 15px;" />\\r\\n                </td>\\r\\n            </tr>\\r\\n            <tr>\\r\\n                <td class="padding-small">\\r\\n                    <label class="input-label"><%= scope.textHorTitle %></label>\\r\\n                    <div id="chart-dlg-combo-hor-title" class="input-group-nr"></div>\\r\\n                </td>\\r\\n                <td class="padding-small">\\r\\n                    <label class="input-label" style="margin-left: 15px;"><%= scope.textVertTitle %></label>\\r\\n                    <div id="chart-dlg-combo-vert-title" class="input-group-nr" style="margin-left: 15px;" />\\r\\n                </td>\\r\\n            </tr>\\r\\n            <tr>\\r\\n                <td class="padding-small">\\r\\n                    <label class="input-label"><%= scope.textHorGrid %></label>\\r\\n                    <div id="chart-dlg-combo-hor-grid" class="input-group-nr"></div>\\r\\n                </td>\\r\\n                <td class="padding-small">\\r\\n                    <label class="input-label" style="margin-left: 15px;"><%= scope.textVertGrid %></label>\\r\\n                    <div id="chart-dlg-combo-vert-grid" class="input-group-nr" style="margin-left: 15px;" />\\r\\n                </td>\\r\\n            </tr>\\r\\n            <tr>\\r\\n                <td class="padding-small">\\r\\n                    <label class="input-label"><%= scope.textDataLabels %></label>\\r\\n                    <div id="chart-dlg-combo-data-labels" class="input-group-nr"></div>\\r\\n                </td>\\r\\n                <td rowspan="2" class="padding-small">\\r\\n                    <div id="chart-dlg-check-series" style="margin: 20px 0 9px 15px;"></div>\\r\\n                    <div id="chart-dlg-check-category" style="margin: 0 0 9px 15px;"></div>\\r\\n                    <div id="chart-dlg-check-value" style="margin: 0 0 5px 15px;"></div>\\r\\n                </td>\\r\\n            </tr>\\r\\n            <tr>\\r\\n                <td class="padding-small">\\r\\n                    <label class="input-label"><%= scope.textSeparator %></label>\\r\\n                    <div id="chart-dlg-txt-separator" class="input-row" />\\r\\n                </td>\\r\\n            </tr>\\r\\n            <tr>\\r\\n                <td class="padding-small">\\r\\n                    <label id="chart-dlg-label-lines" class="input-label"><%= scope.textLines %></label>\\r\\n                    <div id="chart-dlg-combo-lines" class="input-group-nr"></div>\\r\\n                </td>\\r\\n                <td class="padding-small" style="vertical-align: bottom;">\\r\\n                    <div id="chart-dlg-check-markers" style="margin: 0 0 4px 15px;"></div>\\r\\n                </td>\\r\\n            </tr>\\r\\n        </table>\\r\\n    </div>\\r\\n</div>\\r\\n<div id="id-chart-settings-dlg-vert" class="settings-panel">\\r\\n    <div class="inner-content">\\r\\n        <table cols="3" style="width: 100%">\\r\\n            <tr>\\r\\n                <td colspan="3">\\r\\n                    <label class="header  padding-small"><%= scope.textAxisOptions %></label>\\r\\n                </td>\\r\\n            </tr>\\r\\n            <tr>\\r\\n                <td class="padding-small" width="100">\\r\\n                    <label class="input-label"><%= scope.textMinValue %></label>\\r\\n                </td>\\r\\n                <td class="padding-small" width="115" style="padding-right: 10px;">\\r\\n                    <div id="chart-dlg-combo-mintype"></div>\\r\\n                </td>\\r\\n                <td class="padding-small" width="90">\\r\\n                  
 
 ]]></string> </value>
         </item>
@@ -34342,7 +34345,7 @@ define(\'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template\',[]
             <key> <string>data</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-            </td>\\r\\n                <td class="padding-small" width="115" style="padding-right: 10px;">\\r\\n                    <div id="chart-dlg-combo-mintype"></div>\\r\\n                </td>\\r\\n                <td class="padding-small" width="90">\\r\\n                    <div id="chart-dlg-input-min-value"></div>\\r\\n                </td>\\r\\n            </tr>\\r\\n            <tr>\\r\\n                <td class="padding-large" width="100">\\r\\n                    <label class="input-label"><%= scope.textMaxValue %></label>\\r\\n                </td>\\r\\n                <td class="padding-large" width="115" style="padding-right: 10px;">\\r\\n                    <div id="chart-dlg-combo-maxtype"></div>\\r\\n                </td>\\r\\n                <td class="padding-large" width="90">\\r\\n                    <div id="chart-dlg-input-max-value"></div>\\r\\n                </td>\\r\\n            </tr>\\r\\n            <tr>\\r\\n                <td class="padding-large" width="100">\\r\\n                    <label class="input-label"><%= scope.textAxisCrosses %></label>\\r\\n                </td>\\r\\n                <td class="padding-large" width="115" style="padding-right: 10px;">\\r\\n                    <div id="chart-dlg-combo-v-crosstype"></div>\\r\\n                </td>\\r\\n                <td class="padding-large" width="90">\\r\\n                    <div id="chart-dlg-input-v-axis-crosses"></div>\\r\\n                </td>\\r\\n            </tr>\\r\\n        </table>\\r\\n    </div>\\r\\n    <div class="inner-content">\\r\\n        <table cols="1" style="width: 100%;">\\r\\n            <tr>\\r\\n                <td class="padding-large">\\r\\n                    <label class="input-label"><%= scope.textUnits %></label>\\r\\n                    <div id="chart-dlg-combo-units" class="input-group-nr" style="width:140px;"></div>\\r\\n                </td>\\r\\n            </tr>\\r\\n            <tr>\\r\\n                <td class="padding-large">\\r\\n                    <div id="chart-dlg-check-v-reverse"></div>\\r\\n                </td>\\r\\n            </tr>\\r\\n        </table>\\r\\n    </div>\\r\\n    <div class="separator horizontal padding-large"></div>\\r\\n    <div class="inner-content">\\r\\n        <table cols="2" style="width: 100%;">\\r\\n            <tr>\\r\\n                <td colspan=2 class="padding-small">\\r\\n                    <label class="header"><%= scope.textTickOptions %></label>\\r\\n                </td>\\r\\n            </tr>\\r\\n            <tr>\\r\\n                <td class="padding-large">\\r\\n                    <label class="input-label"><%= scope.textMajorType %></label>\\r\\n                    <div id="chart-dlg-combo-v-major-type" class="input-group-nr"></div>\\r\\n                </td>\\r\\n                <td class="padding-large">\\r\\n                    <label class="input-label" style="margin-left: 15px;"><%= scope.textMinorType %></label>\\r\\n                    <div id="chart-dlg-combo-v-minor-type" class="input-group-nr" style="margin-left: 15px;" />\\r\\n                </td>\\r\\n            </tr>\\r\\n        </table>\\r\\n    </div>\\r\\n    <div class="separator horizontal padding-large"></div>\\r\\n    <div class="inner-content">\\r\\n        <table cols="1" style="width: 100%;">\\r\\n            <tr>\\r\\n                <td class="padding-small">\\r\\n                    <label class="header"><%= scope.textLabelOptions %></label>\\r\\n                </td>\\r\\n            </tr>\\r\\n            <tr>\\r\\n                <td>\\r\\n                    <label class="input-label"><%= scope.textLabelPos %></label>\\r\\n                    <div id="chart-dlg-combo-v-label-pos" class="input-group-nr" style="width:140px;"></div>\\r\\n                </td>\\r\\n            </tr>\\r\\n        </table>\\r\\n    </div>\\r\\n</div>\\r\\n<div id="id-chart-settings-dlg-hor" class="settings-panel">\\r\\n    <div class="inner-content">\\r\\n        <table cols="3" style="width: 100%">\\r\\n            <tr>\\r\\n                <td colspan="3">\\r\\n                    <label class="header  padding-small"><%= scope.textAxisOptions %></label>\\r\\n                </td>\\r\\n            </tr>\\r\\n            <tr>\\r\\n                <td class="padding-small" width="100">\\r\\n                    <label class="input-label"><%= scope.textAxisCrosses %></label>\\r\\n                </td>\\r\\n                <td class="padding-small" width="115" style="padding-right: 10px;">\\r\\n                    <div id="chart-dlg-combo-h-crosstype"></div>\\r\\n                </td>\\r\\n                <td class="padding-small" width="90">\\r\\n                    <div id="chart-dlg-input-h-axis-crosses"></div>\\r\\n                </td>\\r\\n            </tr>\\r\\n        </table>\\r\\n    </div>\\r\\n    <div class="inner-content">\\r\\n        <table cols="1" style="width: 100%;">\\r\\n            <tr>\\r\\n                <td class="padding-large" width="140">\\r\\n                    <label class="input-label"><%= scope.textAxisPos %></label>\\r\\n                    <div id="chart-dlg-combo-axis-pos" class="input-group-nr" style="width:140px;"></div>\\r\\n                </td>\\r\\n            </tr>\\r\\n            <tr>\\r\\n                <td class="padding-large">\\r\\n                    <div id="chart-dlg-check-h-reverse"></div>\\r\\n                </td>\\r\\n            </tr>\\r\\n        </table>\\r\\n    </div>\\r\\n    <div class="separator horizontal padding-large"></div>\\r\\n    <div class="inner-content">\\r\\n        <table cols="2" style="width: 100%;">\\r\\n            <tr>\\r\\n                <td colspan=2 class="padding-small">\\r\\n                    <label class="header"><%= scope.textTickOptions %></label>\\r\\n                </td>\\r\\n            </tr>\\r\\n            <tr>\\r\\n                <td class="padding-small" width="140">\\r\\n                    <label class="input-label"><%= scope.textMajorType %></label>\\r\\n                    <div id="chart-dlg-combo-h-major-type" class="input-group-nr"></div>\\r\\n                </td>\\r\\n                <td class="padding-small">\\r\\n                    <label class="input-label" style="margin-left: 15px;"><%= scope.textMinorType %></label>\\r\\n                    <div id="chart-dlg-combo-h-minor-type" class="input-group-nr" style="margin-left: 15px;"></div>\\r\\n                </td>\\r\\n            </tr>\\r\\n            <tr>\\r\\n                <td width="100%" colspan="2">\\r\\n                    <label class="input-label"><%= scope.textMarksInterval %></label>\\r\\n                </td>\\r\\n            </tr>\\r\\n            <tr>\\r\\n                <td class="padding-large" width="140">\\r\\n                    <div id="chart-dlg-input-marks-interval"></div>\\r\\n                </td>\\r\\n                <td class="padding-large">\\r\\n                </td>\\r\\n            </tr>\\r\\n        </table>\\r\\n    </div>\\r\\n    <div class="separator horizontal padding-large"></div>\\r\\n    <div class="inner-content">\\r\\n        <table cols="2" style="width: 100%;">\\r\\n            <tr>\\r\\n                <td colspan=2 class="padding-small">\\r\\n                    <label class="header"><%= scope.textLabelOptions %></label>\\r\\n                </td>\\r\\n            </tr>\\r\\n            <tr>\\r\\n                <td class="padding-small" width="140">\\r\\n                    <label class="input-label"><%= scope.textLabelPos %></label>\\r\\n                    <div id="chart-dlg-combo-h-label-pos" class="input-group-nr"></div>\\r\\n                </td>\\r\\n                <td class="padding-small">\\r\\n                    <label class="input-label" style="margin-left: 15px;"><%= scope.textLabelDist %></label>\\r\\n                    <div id="chart-dlg-input-label-dist" style="margin-left: 15px;"></div>\\r\\n                </td>\\r\\n            </tr>\\r\\n            <tr>\\r\\n                <td width="100%" colspan="2">\\r\\n                    <label class="input-label"><%= scope.textLabelInterval %></label>\\r\\n                </td>\\r\\n            </tr>\\r\\n            <tr>\\r\\n                <td width="140">\\r\\n                    <div id="chart-dlg-combo-label-int" class="input-group-nr"></div>\\r\\n                </td>\\r\\n                <td style="vertical-align: bottom;">\\r\\n                    <div id="chart-dlg-input-label-int" style="margin-left: 15px;"></div>\\r\\n                </td>\\r\\n            </tr>\\r\\n        </table>\\r\\n    </div>\\r\\n</div>\';});\n
+  <div id="chart-dlg-input-min-value"></div>\\r\\n                </td>\\r\\n            </tr>\\r\\n            <tr>\\r\\n                <td class="padding-large" width="100">\\r\\n                    <label class="input-label"><%= scope.textMaxValue %></label>\\r\\n                </td>\\r\\n                <td class="padding-large" width="115" style="padding-right: 10px;">\\r\\n                    <div id="chart-dlg-combo-maxtype"></div>\\r\\n                </td>\\r\\n                <td class="padding-large" width="90">\\r\\n                    <div id="chart-dlg-input-max-value"></div>\\r\\n                </td>\\r\\n            </tr>\\r\\n            <tr>\\r\\n                <td class="padding-large" width="100">\\r\\n                    <label class="input-label"><%= scope.textAxisCrosses %></label>\\r\\n                </td>\\r\\n                <td class="padding-large" width="115" style="padding-right: 10px;">\\r\\n                    <div id="chart-dlg-combo-v-crosstype"></div>\\r\\n                </td>\\r\\n                <td class="padding-large" width="90">\\r\\n                    <div id="chart-dlg-input-v-axis-crosses"></div>\\r\\n                </td>\\r\\n            </tr>\\r\\n        </table>\\r\\n    </div>\\r\\n    <div class="inner-content">\\r\\n        <table cols="1" style="width: 100%;">\\r\\n            <tr>\\r\\n                <td class="padding-large">\\r\\n                    <label class="input-label"><%= scope.textUnits %></label>\\r\\n                    <div id="chart-dlg-combo-units" class="input-group-nr" style="width:140px;"></div>\\r\\n                </td>\\r\\n            </tr>\\r\\n            <tr>\\r\\n                <td class="padding-large">\\r\\n                    <div id="chart-dlg-check-v-reverse"></div>\\r\\n                </td>\\r\\n            </tr>\\r\\n        </table>\\r\\n    </div>\\r\\n    <div class="separator horizontal padding-large"></div>\\r\\n    <div class="inner-content">\\r\\n        <table cols="2" style="width: 100%;">\\r\\n            <tr>\\r\\n                <td colspan=2 class="padding-small">\\r\\n                    <label class="header"><%= scope.textTickOptions %></label>\\r\\n                </td>\\r\\n            </tr>\\r\\n            <tr>\\r\\n                <td class="padding-large">\\r\\n                    <label class="input-label"><%= scope.textMajorType %></label>\\r\\n                    <div id="chart-dlg-combo-v-major-type" class="input-group-nr"></div>\\r\\n                </td>\\r\\n                <td class="padding-large">\\r\\n                    <label class="input-label" style="margin-left: 15px;"><%= scope.textMinorType %></label>\\r\\n                    <div id="chart-dlg-combo-v-minor-type" class="input-group-nr" style="margin-left: 15px;" />\\r\\n                </td>\\r\\n            </tr>\\r\\n        </table>\\r\\n    </div>\\r\\n    <div class="separator horizontal padding-large"></div>\\r\\n    <div class="inner-content">\\r\\n        <table cols="1" style="width: 100%;">\\r\\n            <tr>\\r\\n                <td class="padding-small">\\r\\n                    <label class="header"><%= scope.textLabelOptions %></label>\\r\\n                </td>\\r\\n            </tr>\\r\\n            <tr>\\r\\n                <td>\\r\\n                    <label class="input-label"><%= scope.textLabelPos %></label>\\r\\n                    <div id="chart-dlg-combo-v-label-pos" class="input-group-nr" style="width:140px;"></div>\\r\\n                </td>\\r\\n            </tr>\\r\\n        </table>\\r\\n    </div>\\r\\n</div>\\r\\n<div id="id-chart-settings-dlg-hor" class="settings-panel">\\r\\n    <div class="inner-content">\\r\\n        <table cols="3" style="width: 100%">\\r\\n            <tr>\\r\\n                <td colspan="3">\\r\\n                    <label class="header  padding-small"><%= scope.textAxisOptions %></label>\\r\\n                </td>\\r\\n            </tr>\\r\\n            <tr>\\r\\n                <td class="padding-small" width="100">\\r\\n                    <label class="input-label"><%= scope.textAxisCrosses %></label>\\r\\n                </td>\\r\\n                <td class="padding-small" width="115" style="padding-right: 10px;">\\r\\n                    <div id="chart-dlg-combo-h-crosstype"></div>\\r\\n                </td>\\r\\n                <td class="padding-small" width="90">\\r\\n                    <div id="chart-dlg-input-h-axis-crosses"></div>\\r\\n                </td>\\r\\n            </tr>\\r\\n        </table>\\r\\n    </div>\\r\\n    <div class="inner-content">\\r\\n        <table cols="1" style="width: 100%;">\\r\\n            <tr>\\r\\n                <td class="padding-large" width="140">\\r\\n                    <label class="input-label"><%= scope.textAxisPos %></label>\\r\\n                    <div id="chart-dlg-combo-axis-pos" class="input-group-nr" style="width:140px;"></div>\\r\\n                </td>\\r\\n            </tr>\\r\\n            <tr>\\r\\n                <td class="padding-large">\\r\\n                    <div id="chart-dlg-check-h-reverse"></div>\\r\\n                </td>\\r\\n            </tr>\\r\\n        </table>\\r\\n    </div>\\r\\n    <div class="separator horizontal padding-large"></div>\\r\\n    <div class="inner-content">\\r\\n        <table cols="2" style="width: 100%;">\\r\\n            <tr>\\r\\n                <td colspan=2 class="padding-small">\\r\\n                    <label class="header"><%= scope.textTickOptions %></label>\\r\\n                </td>\\r\\n            </tr>\\r\\n            <tr>\\r\\n                <td class="padding-small" width="140">\\r\\n                    <label class="input-label"><%= scope.textMajorType %></label>\\r\\n                    <div id="chart-dlg-combo-h-major-type" class="input-group-nr"></div>\\r\\n                </td>\\r\\n                <td class="padding-small">\\r\\n                    <label class="input-label" style="margin-left: 15px;"><%= scope.textMinorType %></label>\\r\\n                    <div id="chart-dlg-combo-h-minor-type" class="input-group-nr" style="margin-left: 15px;"></div>\\r\\n                </td>\\r\\n            </tr>\\r\\n            <tr>\\r\\n                <td width="100%" colspan="2">\\r\\n                    <label class="input-label"><%= scope.textMarksInterval %></label>\\r\\n                </td>\\r\\n            </tr>\\r\\n            <tr>\\r\\n                <td class="padding-large" width="140">\\r\\n                    <div id="chart-dlg-input-marks-interval"></div>\\r\\n                </td>\\r\\n                <td class="padding-large">\\r\\n                </td>\\r\\n            </tr>\\r\\n        </table>\\r\\n    </div>\\r\\n    <div class="separator horizontal padding-large"></div>\\r\\n    <div class="inner-content">\\r\\n        <table cols="2" style="width: 100%;">\\r\\n            <tr>\\r\\n                <td colspan=2 class="padding-small">\\r\\n                    <label class="header"><%= scope.textLabelOptions %></label>\\r\\n                </td>\\r\\n            </tr>\\r\\n            <tr>\\r\\n                <td class="padding-small" width="140">\\r\\n                    <label class="input-label"><%= scope.textLabelPos %></label>\\r\\n                    <div id="chart-dlg-combo-h-label-pos" class="input-group-nr"></div>\\r\\n                </td>\\r\\n                <td class="padding-small">\\r\\n                    <label class="input-label" style="margin-left: 15px;"><%= scope.textLabelDist %></label>\\r\\n                    <div id="chart-dlg-input-label-dist" style="margin-left: 15px;"></div>\\r\\n                </td>\\r\\n            </tr>\\r\\n            <tr>\\r\\n                <td width="100%" colspan="2">\\r\\n                    <label class="input-label"><%= scope.textLabelInterval %></label>\\r\\n                </td>\\r\\n            </tr>\\r\\n            <tr>\\r\\n                <td width="140">\\r\\n                    <div id="chart-dlg-combo-label-int" class="input-group-nr"></div>\\r\\n                </td>\\r\\n                <td style="vertical-align: bottom;">\\r\\n                    <div id="chart-dlg-input-label-int" style="margin-left: 15px;"></div>\\r\\n                </td>\\r\\n            </tr>\\r\\n        </table>\\r\\n    </div>\\r\\n</div>\';});\n
 \n
 /*\r\n
  * (c) Copyright Ascensio System SIA 2010-2015\r\n
@@ -35619,7 +35622,10 @@ define(\'spreadsheeteditor/main/app/view/CellRangeDialog\',["common/main/lib/com
                     if (me.cmbDataDirect.isDisabled()) {\r\n
                         me.cmbDataDirect.setDisabled(false);\r\n
                     }\r\n
-                    
+                    var isvalid = me.api.asc_checkDataRange(c_oAscSelectionDialogType.Chart, value, false);\r\n
+                    return (isvalid == c_oAscError.ID.DataRangeError) ? me.textInvalidRange : true;\r\n
+                };\r\n
+                this.cmbDataDirect.setDisabled(value === null)
 
 ]]></string> </value>
         </item>
@@ -35642,10 +35648,7 @@ define(\'spreadsheeteditor/main/app/view/CellRangeDialog\',["common/main/lib/com
             <key> <string>data</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-var isvalid = me.api.asc_checkDataRange(c_oAscSelectionDialogType.Chart, value, false);\r\n
-                    return (isvalid == c_oAscError.ID.DataRangeError) ? me.textInvalidRange : true;\r\n
-                };\r\n
-                this.cmbDataDirect.setDisabled(value === null);\r\n
+;\r\n
                 this.cmbDataDirect.setValue(props.getInColumns() ? 1 : 0);\r\n
                 this.cmbChartTitle.setValue(props.getTitle());\r\n
                 this.cmbLegendPos.setValue(props.getLegendPos());\r\n
@@ -36906,7 +36909,9 @@ define(\'common/main/lib/component/Slider\',["common/main/lib/component/BaseView
             values: [0, 100]\r\n
         },\r\n
         disabled: false,\r\n
-        template: _.template([\'<div class="slider multi-slider">\', \'<div class="track">\', \'<div class="track
+        template: _.template([\'<div class="slider multi-slider">\', \'<div class="track">\', \'<div class="track-left"></div>\', \'<div class="track-center""></div>\', \'<div class="track-right" style=""></div>\', "</div>", "<% _.each(items, function(item) { %>", \'<div class="thumb" style=""></div>\', "<% }); %>", "</div>"].join("")),\r\n
+        initialize: function (options) {\r\n
+          
 
 ]]></string> </value>
         </item>
@@ -36929,9 +36934,7 @@ define(\'common/main/lib/component/Slider\',["common/main/lib/component/BaseView
             <key> <string>data</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
--left"></div>\', \'<div class="track-center""></div>\', \'<div class="track-right" style=""></div>\', "</div>", "<% _.each(items, function(item) { %>", \'<div class="thumb" style=""></div>\', "<% }); %>", "</div>"].join("")),\r\n
-        initialize: function (options) {\r\n
-            Common.UI.BaseView.prototype.initialize.call(this, options);\r\n
+  Common.UI.BaseView.prototype.initialize.call(this, options);\r\n
             var me = this,\r\n
             el = $(this.el);\r\n
             me.width = me.options.width;\r\n
@@ -38199,7 +38202,16 @@ define(\'text!spreadsheeteditor/main/app/template/ShapeSettingsAdvanced.template
                     {\r\n
                         color: "FFFFFF",\r\n
                         effectId: 2\r\n
-          
+                    },\r\n
+                    {\r\n
+                        color: "000000",\r\n
+                        effectId: 1\r\n
+                    },\r\n
+                    {\r\n
+                        color: "000000",\r\n
+                        effectId: 1\r\n
+                    },\r\n
+      
 
 ]]></string> </value>
         </item>
@@ -38222,16 +38234,7 @@ define(\'text!spreadsheeteditor/main/app/template/ShapeSettingsAdvanced.template
             <key> <string>data</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-          },\r\n
-                    {\r\n
-                        color: "000000",\r\n
-                        effectId: 1\r\n
-                    },\r\n
-                    {\r\n
-                        color: "000000",\r\n
-                        effectId: 1\r\n
-                    },\r\n
-                    {\r\n
+              {\r\n
                         color: "FFFFFF",\r\n
                         effectId: 2\r\n
                     },\r\n
@@ -39873,7 +39876,13 @@ define(\'text!spreadsheeteditor/main/app/template/ShapeSettingsAdvanced.template
                 fill.asc_getFill().asc_putColors([Common.Utils.ThemeColor.getRgbColor(this.GradColor.colors[0]), Common.Utils.ThemeColor.getRgbColor(this.GradColor.colors[1])]);\r\n
                 props.asc_putFill(fill);\r\n
                 this.imgprops.asc_putShapeProperties(props);\r\n
-      
+                this.api.asc_setGraphicObjectProps(this.imgprops);\r\n
+            }\r\n
+            Common.NotificationCenter.trigger("edit:complete", this);\r\n
+        },\r\n
+        onSelectGradient: function (btn, picker, itemView, record) {\r\n
+            if (this._noApply) {\r\n
+        
 
 ]]></string> </value>
         </item>
@@ -39896,13 +39905,7 @@ define(\'text!spreadsheeteditor/main/app/template/ShapeSettingsAdvanced.template
             <key> <string>data</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-          this.api.asc_setGraphicObjectProps(this.imgprops);\r\n
-            }\r\n
-            Common.NotificationCenter.trigger("edit:complete", this);\r\n
-        },\r\n
-        onSelectGradient: function (btn, picker, itemView, record) {\r\n
-            if (this._noApply) {\r\n
-                return;\r\n
+        return;\r\n
             }\r\n
             var rawData = {},\r\n
             isPickerSelect = _.isFunction(record.toJSON);\r\n
@@ -41083,7 +41086,13 @@ define(\'spreadsheeteditor/main/app/view/RightMenu\',["text!spreadsheeteditor/ma
                 });\r\n
             }\r\n
         },\r\n
-       
+        onFocusObject: function (SelectedObjects) {\r\n
+            if (!this.editMode) {\r\n
+                return;\r\n
+            }\r\n
+            for (var i = 0; i < this._settings.length; ++i) {\r\n
+                if (this._settings[i]) {\r\n
+                    this._settings[i].hidden =
 
 ]]></string> </value>
         </item>
@@ -41106,13 +41115,7 @@ define(\'spreadsheeteditor/main/app/view/RightMenu\',["text!spreadsheeteditor/ma
             <key> <string>data</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
- onFocusObject: function (SelectedObjects) {\r\n
-            if (!this.editMode) {\r\n
-                return;\r\n
-            }\r\n
-            for (var i = 0; i < this._settings.length; ++i) {\r\n
-                if (this._settings[i]) {\r\n
-                    this._settings[i].hidden = 1;\r\n
+ 1;\r\n
                     this._settings[i].locked = false;\r\n
                 }\r\n
             }\r\n
@@ -42289,7 +42292,12 @@ define(\'common/main/lib/view/Comments\',["text!common/main/lib/template/Comment
             topPos = 0,\r\n
             sdkBoundsTopPos = 0;\r\n
             if (commentsView && arrowView && editorView && editorView.get(0)) {\r\n
-                editorBounds
+                editorBounds = editorView.get(0).getBoundingClientRect();\r\n
+                if (editorBounds) {\r\n
+                    sdkBoundsHeight = editorBounds.height - this.sdkBounds.padding * 2;\r\n
+                    this.$window.css({\r\n
+                        maxHeight: sdkBoundsHeight + "px"\r\n
+
 
 ]]></string> </value>
         </item>
@@ -42312,11 +42320,6 @@ define(\'common/main/lib/view/Comments\',["text!common/main/lib/template/Comment
             <key> <string>data</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
- = editorView.get(0).getBoundingClientRect();\r\n
-                if (editorBounds) {\r\n
-                    sdkBoundsHeight = editorBounds.height - this.sdkBounds.padding * 2;\r\n
-                    this.$window.css({\r\n
-                        maxHeight: sdkBoundsHeight + "px"\r\n
                     });\r\n
                     this.sdkBounds.width = editorBounds.width;\r\n
                     this.sdkBounds.height = editorBounds.height;\r\n
@@ -43575,7 +43578,12 @@ define(\'common/main/lib/component/LoadMask\',["common/main/lib/component/BaseVi
         };\r\n
     })());\r\n
 });\n
-
+/*\r\n
+ * (c) Copyright Ascensio System SIA 2010-2015\r\n
+ *\r\n
+ * This program is a free software product. You can redistribute it and/or \r\n
+ * modify it under the terms of the GNU Affero General Public License (AGPL) \r\n
+ * version 3 as published by the Free Software Foundation. I
 
 ]]></string> </value>
         </item>
@@ -43598,12 +43606,7 @@ define(\'common/main/lib/component/LoadMask\',["common/main/lib/component/BaseVi
             <key> <string>data</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-/*\r\n
- * (c) Copyright Ascensio System SIA 2010-2015\r\n
- *\r\n
- * This program is a free software product. You can redistribute it and/or \r\n
- * modify it under the terms of the GNU Affero General Public License (AGPL) \r\n
- * version 3 as published by the Free Software Foundation. In accordance with \r\n
+n accordance with \r\n
  * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect \r\n
  * that Ascensio System SIA expressly excludes the warranty of non-infringement\r\n
  * of any third-party rights.\r\n
@@ -44991,7 +44994,13 @@ define(\'common/main/lib/component/LoadMask\',["common/main/lib/component/BaseVi
             this.btnComments.on("click", _.bind(this.onBtnMenuClick, this));\r\n
             this.btnChat.on("click", _.bind(this.onBtnMenuClick, this));\r\n
             this.btnSearch.on("click", _.bind(this.onBtnMenuClick, this));\r\n
-            this.btnAbout.on("toggle", _.bind(this.onBtnMenuToggle, this
+            this.btnAbout.on("toggle", _.bind(this.onBtnMenuToggle, this));\r\n
+            this.btnFile.on("toggle", _.bind(this.onBtnMenuToggle, this));\r\n
+            var menuFile = new SSE.Views.FileMenu({});\r\n
+            menuFile.options = {\r\n
+                alias: "FileMenu"\r\n
+            };\r\n
+            this.btnFile.panel = menuFile.render()
 
 ]]></string> </value>
         </item>
@@ -45014,13 +45023,7 @@ define(\'common/main/lib/component/LoadMask\',["common/main/lib/component/BaseVi
             <key> <string>data</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-));\r\n
-            this.btnFile.on("toggle", _.bind(this.onBtnMenuToggle, this));\r\n
-            var menuFile = new SSE.Views.FileMenu({});\r\n
-            menuFile.options = {\r\n
-                alias: "FileMenu"\r\n
-            };\r\n
-            this.btnFile.panel = menuFile.render();\r\n
+;\r\n
             this.btnAbout.panel = (new Common.Views.About({\r\n
                 el: $("#about-menu-panel"),\r\n
                 appName: "Spreadsheet Editor"\r\n
@@ -46447,7 +46450,15 @@ define(\'common/main/lib/controller/Fonts\',["core", "common/main/lib/collection
         textListDescription: "Select Function",\r\n
         sDescription: "Description",\r\n
         txtTitle: "Insert Function",\r\n
-   
+        syntaxText: "Syntax"\r\n
+    },\r\n
+    SSE.Views.FormulaDialog || {}));\r\n
+});\n
+/*\r\n
+ * (c) Copyright Ascensio System SIA 2010-2015\r\n
+ *\r\n
+ * This program is a free software product. You can redistribute it and/or \r\n
+ * modify it under the terms of the GNU Affero General Public 
 
 ]]></string> </value>
         </item>
@@ -46470,15 +46481,7 @@ define(\'common/main/lib/controller/Fonts\',["core", "common/main/lib/collection
             <key> <string>data</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-     syntaxText: "Syntax"\r\n
-    },\r\n
-    SSE.Views.FormulaDialog || {}));\r\n
-});\n
-/*\r\n
- * (c) Copyright Ascensio System SIA 2010-2015\r\n
- *\r\n
- * This program is a free software product. You can redistribute it and/or \r\n
- * modify it under the terms of the GNU Affero General Public License (AGPL) \r\n
+License (AGPL) \r\n
  * version 3 as published by the Free Software Foundation. In accordance with \r\n
  * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect \r\n
  * that Ascensio System SIA expressly excludes the warranty of non-infringement\r\n
@@ -46962,6 +46965,9 @@ define(\'common/main/lib/controller/Fonts\',["core", "common/main/lib/collection
                     this.api.asc_getEditorPermissions();\r\n
                 }\r\n
             },\r\n
+            onSave: function (data) {\r\n
+                this.api.asc_Save();\r\n
+            },\r\n
             onProcessSaveResult: function (data) {\r\n
                 //XXX\r\n
                 //this.api.asc_OnSaveEnd(data.result);\r\n
@@ -47235,6 +47241,7 @@ define(\'common/main/lib/controller/Fonts\',["core", "common/main/lib/collection
                     Common.component.Analytics.initialize("UA-12442749-13", "Spreadsheet Editor");\r\n
                 }\r\n
                 Common.Gateway.on("applyeditrights", _.bind(me.onApplyEditRights, me));\r\n
+                Common.Gateway.on("save", _.bind(me.onSave, me));\r\n
                 Common.Gateway.on("processsaveresult", _.bind(me.onProcessSaveResult, me));\r\n
                 Common.Gateway.on("processrightschange", _.bind(me.onProcessRightsChange, me));\r\n
                 Common.Gateway.on("processmouse", _.bind(me.onProcessMouse, me));\r\n
@@ -47624,7 +47631,8 @@ define(\'common/main/lib/controller/Fonts\',["core", "common/main/lib/collection
             },\r\n
             onDocumentCanSaveChanged: function (isCanSave) {\r\n
                 if (this.toolbarView) {\r\n
-          
+                    var isSyncButton = $(".btn-icon", this.toolbarView.btnSave.cmpEl).hasClass("btn-synch");\r\n
+            
 
 ]]></string> </value>
         </item>
@@ -47647,8 +47655,7 @@ define(\'common/main/lib/controller/Fonts\',["core", "common/main/lib/collection
             <key> <string>data</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-          var isSyncButton = $(".btn-icon", this.toolbarView.btnSave.cmpEl).hasClass("btn-synch");\r\n
-                    if (this.toolbarView.btnSave.isDisabled() !== (!isCanSave && !isSyncButton)) {\r\n
+        if (this.toolbarView.btnSave.isDisabled() !== (!isCanSave && !isSyncButton)) {\r\n
                         this.toolbarView.btnSave.setDisabled(!isCanSave && !isSyncButton);\r\n
                     }\r\n
                 }\r\n
@@ -47848,6 +47855,9 @@ define(\'common/main/lib/controller/Fonts\',["core", "common/main/lib/collection
                     case "setChartData":\r\n
                         this.setChartData(data.data);\r\n
                         break;\r\n
+                    case "save":\r\n
+                        this.api.asc_Save();\r\n
+                        break;\r\n
                     case "getChartData":\r\n
                         this.getChartData();\r\n
                         break;\r\n