Merge pull request #12 from ONLYOFFICE/release/4.0.1

Release/4.0.1

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

@@ -67,7 +67,7 @@ define([
                         '<td align="center"><label class="asc-about-version">' + options.appName.toUpperCase() + '</label></td>',
                     '</tr>',
                     '<tr>',
-                        '<td align="center"><label class="asc-about-version">' + this.txtVersion + this.txtVersionNum + '</label></td>',
+                        '<td align="center"><label class="asc-about-version" id="id-about-licensor-version-name">' + this.txtVersion + this.txtVersionNum + '</label></td>',
                     '</tr>',
                 '</table>',
                 '<table id="id-about-licensor-info" cols="3" style="width: 100%;" class="margin-bottom">',
@@ -106,7 +106,7 @@ define([
                         '<td align="center"><label class="asc-about-version">' + options.appName.toUpperCase()  + '</label></td>',
                     '</tr>',
                     '<tr>',
-                        '<td align="center"><label style="padding-bottom: 29px;" class="asc-about-version">' + this.txtVersion + this.txtVersionNum + '</label></td>',
+                        '<td align="center"><label style="padding-bottom: 29px;" class="asc-about-version" id="id-about-licensee-version-name">' + this.txtVersion + this.txtVersionNum + '</label></td>',
                     '</tr>',
                     '<tr>',
                         '<td align="center" class="padding-small">',
@@ -235,6 +235,13 @@ define([
             this.fireEvent('hide', this );
         },
 
+        setMode: function(mode){
+            if (mode.isLightVersion) {
+                $('#id-about-licensor-version-name').text(this.txtEdition + this.txtVersion + this.txtVersionNum);
+                $('#id-about-licensee-version-name').text(this.txtEdition + this.txtVersion + this.txtVersionNum);
+            }
+        },
+
         txtPoweredBy: 'Powered by',
         txtVersion: 'Version ',
         txtLicensor: 'LICENSOR',
@@ -242,7 +249,8 @@ define([
         txtAddress: 'address: ',
         txtAscAddress: 'Lubanas st. 125a-25, Riga, Latvia, EU, LV-1021',
         txtMail: 'email: ',
-        txtTel: 'tel.: '
+        txtTel: 'tel.: ',
+        txtEdition: 'Integration Edition '
 
     }, Common.Views.About || {}));
 });

apps/documenteditor/main/app/template/ImageSettings.template

@@ -52,7 +52,7 @@
     </tr>
     <tr>
         <td class="padding-small" colspan=2>
-            <button type="button" class="btn btn-text-default hidden" id="image-button-edit-object" style="width:85px;"><%= scope.textEdit %></button>
+            <button type="button" class="btn btn-text-default hidden" id="image-button-edit-object" style="width:100px;"><%= scope.textEdit %></button>
         </td>
     </tr>
     <tr>

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

@@ -348,6 +348,7 @@ define([
 
         setMode: function(mode) {
             this.mode = mode;
+            this.btnAbout.panel.setMode(mode);
             return this;
         },
 

apps/presentationeditor/main/app/template/ImageSettings.template

@@ -24,17 +24,22 @@
     </tr>
     <tr>
         <td colspan=2>
-            <label class="header"><%= scope.textInsert %></label>
+            <label class="header" id="image-lbl-replace" ><%= scope.textInsert %></label>
         </td>
     </tr>
     <tr>
-        <td class="padding-small" width="50%">
+        <td width="50%">
             <button type="button" class="btn btn-text-default" id="image-button-from-file" style="width:85px;"><%= scope.textFromFile %></button>
         </td>
-        <td class="padding-small" width="50%">
+        <td width="50%">
             <button type="button" class="btn btn-text-default" id="image-button-from-url" style="width:85px;"><%= scope.textFromUrl %></button>
         </td>
     </tr>
+    <tr>
+        <td class="padding-small" colspan=2>
+            <button type="button" class="btn btn-text-default hidden" id="image-button-edit-object" style="width:100px;"><%= scope.textEdit %></button>
+        </td>
+    </tr>
     <tr>
         <td class="padding-small" colspan=2>
             <div class="separator horizontal"></div>

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

@@ -70,7 +70,8 @@ define([
             this._state = {
                 Width: 0,
                 Height: 0,
-                DisabledControls: false
+                DisabledControls: false,
+                isOleObject: false
             };
             this.lockedControls = [];
             this._locked = false;
@@ -98,12 +99,21 @@ define([
             });
             this.lockedControls.push(this.btnInsertFromUrl);
 
+            this.btnEditObject = new Common.UI.Button({
+                el: $('#image-button-edit-object')
+            });
+            this.lockedControls.push(this.btnEditObject);
+            
             this.btnOriginalSize.on('click', _.bind(this.setOriginalSize, this));
             this.btnInsertFromFile.on('click', _.bind(function(btn){
                 if (this.api) this.api.ChangeImageFromFile();
                 this.fireEvent('editcomplete', this);
             }, this));
             this.btnInsertFromUrl.on('click', _.bind(this.insertFromUrl, this));
+            this.btnEditObject.on('click', _.bind(function(btn){
+//                if (this.api) this.api.asc_pluginRun(this._originalProps.asc_getPluginGuid(), 0, this._originalProps.asc_getPluginData());
+//                this.fireEvent('editcomplete', this);
+            }, this));
             $(this.el).on('click', '#image-advanced-link', _.bind(this.openAdvancedSettings, this));
         },
 
@@ -114,6 +124,7 @@ define([
             }));
 
             this.linkAdvanced = $('#image-advanced-link');
+            this.lblReplace = $('#image-lbl-replace');
         },
 
         setApi: function(api) {
@@ -157,6 +168,25 @@ define([
                 }
 
                 this.btnOriginalSize.setDisabled(props.get_ImageUrl()===null || props.get_ImageUrl()===undefined || this._locked);
+
+                var pluginGuid = props.asc_getPluginGuid();
+                value = (pluginGuid !== null && pluginGuid !== undefined);
+                if (this._state.isOleObject!==value) {
+                    this.btnInsertFromUrl.setVisible(!value);
+                    this.btnInsertFromFile.setVisible(!value);
+                    this.btnEditObject.setVisible(value);
+                    this.lblReplace.text(value ? this.textEditObject : this.textInsert);
+                    this._state.isOleObject=value;
+                }
+
+                if (this._state.isOleObject) {
+//                    var plugin = DE.getCollection('Common.Collections.Plugins').findWhere({guid: pluginGuid});
+//                    this.btnEditObject.setDisabled(plugin===null || plugin ===undefined);
+                    this.btnEditObject.setDisabled(true);
+                } else {
+                    this.btnInsertFromUrl.setDisabled(pluginGuid===null);
+                    this.btnInsertFromFile.setDisabled(pluginGuid===null);
+                }
             }
         },
 
@@ -253,10 +283,12 @@ define([
         textWidth:      'Width',
         textHeight:     'Height',
         textOriginalSize: 'Default Size',
-        textInsert:     'Insert Image',
+        textInsert:     'Replace Image',
         textFromUrl:    'From URL',
         textFromFile:   'From File',
-        textAdvanced:   'Show advanced settings'
+        textAdvanced:   'Show advanced settings',
+        textEditObject: 'Edit Object',
+        textEdit:       'Edit'
 
     }, PE.Views.ImageSettings || {}));
 });
\ No newline at end of file

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

@@ -340,6 +340,7 @@ define([
 
         setMode: function(mode) {
             this.mode = mode;
+            this.btnAbout.panel.setMode(mode);
             return this;
         },
 

apps/presentationeditor/main/locale/en.json

@@ -397,6 +397,8 @@
   "PE.Views.HyperlinkSettingsDialog.txtPrev": "Previous Slide",
   "PE.Views.HyperlinkSettingsDialog.txtSlide": "Slide",
   "PE.Views.ImageSettings.textAdvanced": "Show advanced settings",
+  "PE.Views.ImageSettings.textEdit": "Edit",
+  "PE.Views.ImageSettings.textEditObject": "Edit Object",
   "PE.Views.ImageSettings.textFromFile": "From File",
   "PE.Views.ImageSettings.textFromUrl": "From URL",
   "PE.Views.ImageSettings.textHeight": "Height",

apps/spreadsheeteditor/main/app/template/ImageSettings.template

@@ -44,7 +44,7 @@
     </tr>
     <tr>
         <td colspan=2>
-            <button type="button" class="btn btn-text-default hidden" id="image-button-edit-object" style="width:85px;"><%= scope.textEdit %></button>
+            <button type="button" class="btn btn-text-default hidden" id="image-button-edit-object" style="width:100px;"><%= scope.textEdit %></button>
         </td>
     </tr>
     <tr class="finish-cell"></tr>

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

@@ -335,6 +335,7 @@ define([
 
         setMode: function(mode) {
             this.mode = mode;
+            this.btnAbout.panel.setMode(mode);
             return this;
         },