Merge branch 'develop' into feature/svg-icons

apps/common/main/lib/controller/Plugins.js

@@ -367,14 +367,14 @@ define([
                     var me = this,
                         isCustomWindow = variation.get_CustomWindow(),
                         arrBtns = variation.get_Buttons(),
-                        newBtns = {},
+                        newBtns = [],
                         size = variation.get_Size();
                         if (!size || size.length<2) size = [800, 600];
 
                     if (_.isArray(arrBtns)) {
                         _.each(arrBtns, function(b, index){
                             if (b.visible)
-                                newBtns[index] = {text: b.text, cls: 'custom' + ((b.primary) ? ' primary' : '')};
+                                newBtns[index] = {caption: b.text, value: index, primary: b.primary};
                         });
                     }
 

apps/common/main/lib/view/Comments.js

@@ -196,23 +196,23 @@ define([
 
                         me.commentsView.reply = replyId;
 
-                        this.autoHeightTextBox();
+                        picker.autoHeightTextBox();
 
                         readdresolves();
 
                         me.hookTextBox();
 
-                        this.autoScrollToEditButtons();
+                        picker.autoScrollToEditButtons();
-                        this.setFocusToTextBox();
+                        picker.setFocusToTextBox();
                     } else {
 
                         if (!showEditBox) {
                             me.fireEvent('comment:closeEditing');
                             record.set('editText', true);
 
-                            this.autoHeightTextBox();
+                            picker.autoHeightTextBox();
                             readdresolves();
-                            this.setFocusToTextBox();
+                            picker.setFocusToTextBox();
                             me.hookTextBox();
                         }
                     }
@@ -232,14 +232,14 @@ define([
 
                     readdresolves();
 
-                    this.autoHeightTextBox();
+                    picker.autoHeightTextBox();
                     me.hookTextBox();
 
-                    this.autoScrollToEditButtons();
+                    picker.autoScrollToEditButtons();
-                    this.setFocusToTextBox();
+                    picker.setFocusToTextBox();
                 } else if (btn.hasClass('btn-reply', false)) {
                     if (showReplyBox) {
-                        me.fireEvent('comment:addReply', [commentId, this.getActiveTextBoxVal()]);
+                        me.fireEvent('comment:addReply', [commentId, picker.getActiveTextBoxVal()]);
                         me.fireEvent('comment:closeEditing');
 
                         readdresolves();
@@ -250,10 +250,10 @@ define([
 
                 } else if (btn.hasClass('btn-inner-edit', false)) {
                     if (!_.isUndefined(me.commentsView.reply)) {
-                        me.fireEvent('comment:changeReply', [commentId, me.commentsView.reply, this.getActiveTextBoxVal()]);
+                        me.fireEvent('comment:changeReply', [commentId, me.commentsView.reply, picker.getActiveTextBoxVal()]);
                         me.commentsView.reply = undefined;
                     } else if (showEditBox) {
-                        me.fireEvent('comment:change', [commentId, this.getActiveTextBoxVal()]);
+                        me.fireEvent('comment:change', [commentId, picker.getActiveTextBoxVal()]);
                     }
 
                     me.fireEvent('comment:closeEditing');

apps/common/main/lib/view/ImageFromUrlDialog.js

@@ -93,7 +93,7 @@ define([
             var me = this;
             _.delay(function(){
                 me.getChild('input').focus();
-            },500);
+            },100);
         },
 
         onPrimary: function(event) {

apps/common/main/lib/view/Plugins.js

@@ -366,11 +366,6 @@ define([
                 '</div>',
                 '<% if ((typeof buttons !== "undefined") && _.size(buttons) > 0) { %>',
                     '<div class="separator horizontal"/>',
-                    '<div class="footer" style="text-align: center;">',
-                        '<% for(var bt in buttons) { %>',
-                            '<button class="btn normal dlg-btn <%= buttons[bt].cls %>" result="<%= bt %>"><%= buttons[bt].text %></button>',
-                        '<% } %>',
-                    '</div>',
                 '<% } %>'
             ].join('');
 

apps/common/main/resources/less/header.less

@@ -142,7 +142,7 @@
             display: inline-block;
             vertical-align: middle;
 
-            background-image: url('@{common-image-path}/header/header-logo.png');
+            background-image: ~"url('@{common-image-const-path}/header/header-logo.png')";
             background-repeat: no-repeat;
 
             @media

apps/documenteditor/main/app/view/AddNewCaptionLabelDialog.js

@@ -94,7 +94,7 @@ define([
             var me = this;
             _.delay(function(){
                 me.getChild('input').focus();
-            },500);
+            },50);
         },
 
         onPrimary: function(event) {

apps/documenteditor/main/app/view/FileMenuPanels.js

@@ -881,7 +881,7 @@ define([
             }).on('keydown:before', keyDownBefore);
 
             this.btnApply = new Common.UI.Button({
-                el: '#fminfo-btn-apply'
+                el: $markup.findById('#fminfo-btn-apply')
             });
             this.btnApply.on('click', _.bind(this.applySettings, this));
 

apps/documenteditor/main/app/view/ParagraphSettings.js

@@ -84,13 +84,13 @@ define([
             this._locked = true;
             this.isChart = false;
 
-            this.render();
-
             this._arrLineRule = [
                 {displayValue: this.textAtLeast,defaultValue: 5, value: c_paragraphLinerule.LINERULE_LEAST, minValue: 0.03,   step: 0.01, defaultUnit: 'cm'},
                 {displayValue: this.textAuto,   defaultValue: 1, value: c_paragraphLinerule.LINERULE_AUTO, minValue: 0.5,    step: 0.01, defaultUnit: ''},
                 {displayValue: this.textExact,  defaultValue: 5, value: c_paragraphLinerule.LINERULE_EXACT, minValue: 0.03,   step: 0.01, defaultUnit: 'cm'}
             ];
+
+            this.render();
         },
 
         render: function () {

apps/documenteditor/main/index.html.deploy

@@ -217,7 +217,7 @@
     <link rel="stylesheet" type="text/css" href="../../../apps/documenteditor/main/resources/css/app.css">
 </head>
 <body>
-    <div id="loading-mask" class="loadmask"><div class="brendpanel"><div><div class="loading-logo"><img src="../../common/main/resources/img/header/header-logo.png"></div><div class="circle"></div><div class="circle"></div><div class="circle"></div><div class="circle"></div><div class="spacer"></div><div class="rect"></div></div><div><span class="rect"></span><span class="rect"></span><span class="rect"></span><span class="rect"></span><span class="rect"></span><div class="spacer"></div><span class="circle"></span><span class="circle"></span><span class="circle"></span></div></div><div class="sktoolbar"><ul><li></li><li class="space"></li><li style="width: 255px;"></li><li class="space"></li><li style="width: 180px;"></li><li class="space"></li><li style="width: 60px;"></li><li class="fat"></li></ul><ul><li></li><li class="space"></li><li style="width: 255px;"></li><li class="space"></li><li style="width: 180px;"></li><li class="space"></li><li style="width: 60px;"></li></ul></div><div class="placeholder"><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div></div></div>
+    <div id="loading-mask" class="loadmask"><div class="brendpanel"><div><div class="loading-logo"><img src="../../../apps/documenteditor/main/resources/img/header/header-logo.png"></div><div class="circle"></div><div class="circle"></div><div class="circle"></div><div class="circle"></div><div class="spacer"></div><div class="rect"></div></div><div><span class="rect"></span><span class="rect"></span><span class="rect"></span><span class="rect"></span><span class="rect"></span><div class="spacer"></div><span class="circle"></span><span class="circle"></span><span class="circle"></span></div></div><div class="sktoolbar"><ul><li></li><li class="space"></li><li style="width: 255px;"></li><li class="space"></li><li style="width: 180px;"></li><li class="space"></li><li style="width: 60px;"></li><li class="fat"></li></ul><ul><li></li><li class="space"></li><li style="width: 255px;"></li><li class="space"></li><li style="width: 180px;"></li><li class="space"></li><li style="width: 60px;"></li></ul></div><div class="placeholder"><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div></div></div>
     <div id="viewport"></div>
 
     <script>

apps/documenteditor/main/resources/less/toolbar.less

@@ -70,7 +70,8 @@
         .loop((@counter - 1));
         li:nth-child(@{counter}) > a.item-contents {
             div {
-                background-position: 0 calc(~"var(--bckgHOffset) - " (@counter - 1)*@contents-menu-item-height);
+                @incr-height: (@counter - 1)*@contents-menu-item-height;
+                background-position: 0 ~"calc(var(--bckgHOffset) - @{incr-height})";
             }
         }
     }

apps/documenteditor/mobile/app/controller/Settings.js

@@ -559,11 +559,11 @@ define([
                     url += '/';
                 }
                 if (Common.SharedSettings.get('sailfish')) {
-                    url+='mobile-applications/documents/sailfish/index.aspx';
+                    url+='mobile-applications/documents/mobile-web-editors/android/index.aspx';
                 } else if (Common.SharedSettings.get('android')) {
-                    url+='mobile-applications/documents/android/index.aspx';
+                    url+='mobile-applications/documents/mobile-web-editors/android/index.aspx';
                 } else {
-                    url+='mobile-applications/documents/index.aspx';
+                    url+='mobile-applications/documents/mobile-web-editors/ios/index.aspx';
                 }
                 window.open(url, "_blank");
                 this.hideModal();

apps/documenteditor/mobile/app/view/edit/EditTable.js

@@ -115,7 +115,7 @@ define([
                 var $styleContainer = $('#edit-table-styles .item-inner');
 
                 if ($styleContainer.length > 0) {
-                    var columns = parseInt($styleContainer.width() / 70), // magic
+                    var columns = parseInt(($styleContainer.width() - 15) / 70), // magic
                         row = -1,
                         styles = [];
 

apps/presentationeditor/main/app/view/FileMenuPanels.js

@@ -758,7 +758,7 @@ define([
             }).on('keydown:before', keyDownBefore);
 
             this.btnApply = new Common.UI.Button({
-                el: '#fminfo-btn-apply'
+                el: $markup.findById('#fminfo-btn-apply')
             });
             this.btnApply.on('click', _.bind(this.applySettings, this));
 

apps/presentationeditor/main/index.html.deploy

@@ -256,7 +256,7 @@
 <body>
     <div id="loading-mask" class="loadmask">
         <div class="brendpanel">
-            <div><div class="loading-logo"><img src="../../common/main/resources/img/header/header-logo.png"></div><div class="circle"></div><div class="circle"></div><div class="circle"></div><div class="circle"></div><div class="spacer"></div><div class="rect"></div></div><div><span class="rect"></span><span class="rect"></span><span class="rect"></span><span class="rect"></span><span class="rect"></span><div class="spacer"></div><span class="circle"></span><span class="circle"></span><span class="circle"></span></div>
+            <div><div class="loading-logo"><img src="../../../apps/presentationeditor/main/resources/img/header/header-logo.png"></div><div class="circle"></div><div class="circle"></div><div class="circle"></div><div class="circle"></div><div class="spacer"></div><div class="rect"></div></div><div><span class="rect"></span><span class="rect"></span><span class="rect"></span><span class="rect"></span><span class="rect"></span><div class="spacer"></div><span class="circle"></span><span class="circle"></span><span class="circle"></span></div>
         </div>
         <div class="sktoolbar">
             <ul><li/><li class="space" style="width: 78px;"/><li/><li class="space"/><li style="width: 210px;"/><li class="space"/><li style="width: 120px;"/><li class="space" style="width: 210px;"/><li style="width: 100px;"/><li class="fat"/></ul>

apps/presentationeditor/mobile/app/view/Settings.js

@@ -192,11 +192,11 @@ define([
                     url += '/';
                 }
                 if (Common.SharedSettings.get('sailfish')) {
-                    url+='mobile-applications/documents/sailfish/index.aspx';
+                    url+='mobile-applications/documents/mobile-web-editors/android/index.aspx';
                 } else if (Common.SharedSettings.get('android')) {
-                    url+='mobile-applications/documents/android/index.aspx';
+                    url+='mobile-applications/documents/mobile-web-editors/android/index.aspx';
                 } else {
-                    url+='mobile-applications/documents/index.aspx';
+                    url+='mobile-applications/documents/mobile-web-editors/ios/index.aspx';
                 }
                 window.open(url, "_blank");
                 PE.getController('Settings').hideModal();

apps/spreadsheeteditor/main/app/view/FileMenuPanels.js

@@ -1211,7 +1211,7 @@ define([
             }).on('keydown:before', keyDownBefore);
 
             this.btnApply = new Common.UI.Button({
-                el: '#fminfo-btn-apply'
+                el: $markup.findById('#fminfo-btn-apply')
             });
             this.btnApply.on('click', _.bind(this.applySettings, this));
 

apps/spreadsheeteditor/main/index.html

@@ -246,6 +246,14 @@
     <div id="viewport"></div>
 
     <script>
+        var params = getUrlParams(),
+            internal = params["internal"] == 'true';
+
+        if (internal) {
+            document.querySelector('.brendpanel').remove();
+            document.querySelector('.sktoolbar').remove();
+        }
+
         if (stopLoading) {
             document.body.removeChild(document.getElementById('loading-mask'));
         } else {
@@ -275,7 +283,6 @@
 
     <script type="text/javascript">
         window.g_debug_mode = true;
-        debugger;
     </script>
 
     <!-- debug begin -->

apps/spreadsheeteditor/main/index.html.deploy

@@ -235,7 +235,7 @@
 <body>
     <div id="loading-mask" class="loadmask">
         <div class="brendpanel"><div>
-            <div class="loading-logo"><img src="../../common/main/resources/img/header/header-logo.png"></div>
+            <div class="loading-logo"><img src="../../../apps/spreadsheeteditor/main/resources/img/header/header-logo.png"></div>
             <div class="circle"></div><div class="circle"></div><div class="circle"></div><div class="circle"></div><div class="spacer"></div><div class="rect"></div></div><div><span class="rect"></span><span class="rect"></span><span class="rect"></span><span class="rect"></span><span class="rect"></span><div class="spacer"></div><span class="circle"></span><span class="circle"></span><span class="circle"></span></div>
         </div>
         <div class="sktoolbar">

apps/spreadsheeteditor/mobile/app/controller/Settings.js

@@ -117,11 +117,11 @@ define([
                                 url += '/';
                             }
                             if (Common.SharedSettings.get('sailfish')) {
-                                url+='mobile-applications/documents/sailfish/index.aspx';
+                                url+='mobile-applications/documents/mobile-web-editors/android/index.aspx';
                             } else if (Common.SharedSettings.get('android')) {
-                                url+='mobile-applications/documents/android/index.aspx';
+                                url+='mobile-applications/documents/mobile-web-editors/android/index.aspx';
                             } else {
-                                url+='mobile-applications/documents/index.aspx';
+                                url+='mobile-applications/documents/mobile-web-editors/ios/index.aspx';
                             }
                             window.open(url, "_blank");
                             this.hideModal();