diff --git a/apps/common/main/lib/controller/HintManager.js b/apps/common/main/lib/controller/HintManager.js
index 548d6e0486..a946ad0f47 100644
--- a/apps/common/main/lib/controller/HintManager.js
+++ b/apps/common/main/lib/controller/HintManager.js
@@ -568,7 +568,7 @@ Common.UI.HintManager = new(function() {
if (curr.prop('id') === 'btn-goback' || curr.closest('.btn-slot').prop('id') === 'slot-btn-options' ||
curr.closest('.btn-slot').prop('id') === 'slot-btn-mode' || curr.prop('id') === 'btn-favorite' || curr.parent().prop('id') === 'tlb-box-users' ||
curr.prop('id') === 'left-btn-thumbs' || curr.hasClass('scroll') || curr.prop('id') === 'left-btn-about' ||
- curr.prop('id') === 'left-btn-support') {
+ curr.prop('id') === 'left-btn-support' || curr.closest('.btn-slot').prop('id') === 'slot-btn-search') {
_resetToDefault();
return;
}
diff --git a/apps/common/main/lib/view/Plugins.js b/apps/common/main/lib/view/Plugins.js
index 75ed76e8b9..37c97cc1da 100644
--- a/apps/common/main/lib/view/Plugins.js
+++ b/apps/common/main/lib/view/Plugins.js
@@ -60,11 +60,11 @@ define([
'',
'',
'
'
@@ -111,6 +111,13 @@ define([
this.currentPluginPanel = $('#current-plugin-box');
this.currentPluginFrame = $('#current-plugin-frame');
+ this.pluginClose = new Common.UI.Button({
+ parentEl: $('#id-plugin-close'),
+ cls: 'btn-toolbar',
+ iconCls: 'toolbar__icon btn-close',
+ hint: this.textClosePanel
+ });
+
this.pluginMenu = new Common.UI.Menu({
menuAlign : 'tr-br',
items: []
@@ -426,7 +433,8 @@ define([
textLoading: 'Loading',
textStart: 'Start',
textStop: 'Stop',
- groupCaption: 'Plugins'
+ groupCaption: 'Plugins',
+ textClosePanel: 'Close plugin'
}, Common.Views.Plugins || {}));
});
\ No newline at end of file
diff --git a/apps/common/main/resources/less/plugins.less b/apps/common/main/resources/less/plugins.less
index bc9d154fde..1bba907aa6 100644
--- a/apps/common/main/resources/less/plugins.less
+++ b/apps/common/main/resources/less/plugins.less
@@ -80,17 +80,20 @@
#current-plugin-header {
position: absolute;
- top: 0;
+ height: 45px;
left: 0;
- width: 100%;
- height: 38px;
- padding: 10px 12px;
+ top: 0;
+ right: 0;
+ padding: 12px;
+ overflow: hidden;
border-bottom: @scaled-one-px-value-ie solid @border-toolbar-ie;
border-bottom: @scaled-one-px-value solid @border-toolbar;
-
+
label {
width: 100%;
+ margin-top: 2px;
padding-right: 20px;
+ font-size: 12px;
.font-weight-bold();
overflow: hidden;
text-overflow: ellipsis;
@@ -98,20 +101,18 @@
}
}
- .tool {
+ .close {
position: absolute;
- top: 9px;
- right: 7px;
- margin: 0;
- /*&:before, &:after {
- width: 2px;
- width: @scaled-two-px-value;
- }*/
+ width: 20px;
+ height: 20px;
+ top: 12px;
+ right: 12px;
}
+
#current-plugin-frame {
width: 100%;
height: 100%;
- padding-top: 38px;
+ padding-top: 45px;
}
}
diff --git a/apps/documenteditor/forms/app.js b/apps/documenteditor/forms/app.js
index 273f140f54..9ec2b75229 100644
--- a/apps/documenteditor/forms/app.js
+++ b/apps/documenteditor/forms/app.js
@@ -47,8 +47,6 @@ require.config({
jmousewheel : '../vendor/perfect-scrollbar/src/jquery.mousewheel',
xregexp : '../vendor/xregexp/xregexp-all-min',
sockjs : '../vendor/sockjs/sockjs.min',
- jszip : '../vendor/jszip/jszip.min',
- jsziputils : '../vendor/jszip-utils/jszip-utils.min',
allfonts : '../../sdkjs/common/AllFonts',
sdk : '../../sdkjs/word/sdk-all-min',
api : 'api/documents/api',
@@ -102,9 +100,7 @@ require.config({
'underscore',
'allfonts',
'xregexp',
- 'sockjs',
- 'jszip',
- 'jsziputils'
+ 'sockjs'
]
},
gateway: {
diff --git a/apps/documenteditor/forms/app_dev.js b/apps/documenteditor/forms/app_dev.js
index 93a96c2d5f..d0ff647a73 100644
--- a/apps/documenteditor/forms/app_dev.js
+++ b/apps/documenteditor/forms/app_dev.js
@@ -47,8 +47,6 @@ require.config({
jmousewheel : '../vendor/perfect-scrollbar/src/jquery.mousewheel',
xregexp : '../vendor/xregexp/xregexp-all-min',
sockjs : '../vendor/sockjs/sockjs.min',
- jszip : '../vendor/jszip/jszip.min',
- jsziputils : '../vendor/jszip-utils/jszip-utils.min',
api : 'api/documents/api',
core : 'common/main/lib/core/application',
notification : 'common/main/lib/core/NotificationCenter',
@@ -115,8 +113,6 @@ require([
'analytics',
'gateway',
'locale',
- 'jszip',
- 'jsziputils',
'sockjs',
'underscore'
], function (Backbone, Bootstrap, Core) {
diff --git a/apps/documenteditor/main/app.js b/apps/documenteditor/main/app.js
index e6a4ded43e..ee567e2112 100644
--- a/apps/documenteditor/main/app.js
+++ b/apps/documenteditor/main/app.js
@@ -54,8 +54,6 @@ require.config({
jmousewheel : '../vendor/perfect-scrollbar/src/jquery.mousewheel',
xregexp : '../vendor/xregexp/xregexp-all-min',
sockjs : '../vendor/sockjs/sockjs.min',
- jszip : '../vendor/jszip/jszip.min',
- jsziputils : '../vendor/jszip-utils/jszip-utils.min',
allfonts : '../../sdkjs/common/AllFonts',
sdk : '../../sdkjs/word/sdk-all-min',
api : 'api/documents/api',
@@ -109,9 +107,7 @@ require.config({
'underscore',
'allfonts',
'xregexp',
- 'sockjs',
- 'jszip',
- 'jsziputils'
+ 'sockjs'
]
},
gateway: {
diff --git a/apps/documenteditor/main/app/view/Toolbar.js b/apps/documenteditor/main/app/view/Toolbar.js
index 3f289d33bb..843c688f9a 100644
--- a/apps/documenteditor/main/app/view/Toolbar.js
+++ b/apps/documenteditor/main/app/view/Toolbar.js
@@ -175,7 +175,7 @@ define([
{caption: me.textTabHome, action: 'home', extcls: 'canedit', dataHintTitle: 'H'},
{caption: me.textTabInsert, action: 'ins', extcls: 'canedit', dataHintTitle: 'I'},
{caption: me.textTabLayout, action: 'layout', extcls: 'canedit', layoutname: 'toolbar-layout', dataHintTitle: 'L'},
- {caption: me.textTabLinks, action: 'links', extcls: 'canedit', layoutname: 'toolbar-references', dataHintTitle: 'R'}
+ {caption: me.textTabLinks, action: 'links', extcls: 'canedit', layoutname: 'toolbar-references', dataHintTitle: 'N'}
// undefined, undefined, undefined, undefined,
]
}
diff --git a/apps/documenteditor/main/app_dev.js b/apps/documenteditor/main/app_dev.js
index ebb623df14..990fa48235 100644
--- a/apps/documenteditor/main/app_dev.js
+++ b/apps/documenteditor/main/app_dev.js
@@ -54,8 +54,6 @@ require.config({
jmousewheel : '../vendor/perfect-scrollbar/src/jquery.mousewheel',
xregexp : '../vendor/xregexp/xregexp-all-min',
sockjs : '../vendor/sockjs/sockjs.min',
- jszip : '../vendor/jszip/jszip.min',
- jsziputils : '../vendor/jszip-utils/jszip-utils.min',
api : 'api/documents/api',
core : 'common/main/lib/core/application',
notification : 'common/main/lib/core/NotificationCenter',
@@ -122,8 +120,6 @@ require([
'analytics',
'gateway',
'locale',
- 'jszip',
- 'jsziputils',
'sockjs',
'underscore'
], function (Backbone, Bootstrap, Core) {
diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json
index adf54a2825..0d1645ea7b 100644
--- a/apps/documenteditor/main/locale/en.json
+++ b/apps/documenteditor/main/locale/en.json
@@ -347,6 +347,7 @@
"Common.Views.Plugins.textLoading": "Loading",
"Common.Views.Plugins.textStart": "Start",
"Common.Views.Plugins.textStop": "Stop",
+ "Common.Views.Plugins.textClosePanel": "Close plugin",
"Common.Views.Protection.hintAddPwd": "Encrypt with password",
"Common.Views.Protection.hintPwd": "Change or delete password",
"Common.Views.Protection.hintSignature": "Add digital signature or signature line",
diff --git a/apps/documenteditor/mobile/src/controller/Main.jsx b/apps/documenteditor/mobile/src/controller/Main.jsx
index d7408414ac..8380ac185d 100644
--- a/apps/documenteditor/mobile/src/controller/Main.jsx
+++ b/apps/documenteditor/mobile/src/controller/Main.jsx
@@ -60,9 +60,7 @@ class MainController extends Component {
!window.sdk_scripts && (window.sdk_scripts = ['../../../../sdkjs/common/AllFonts.js',
'../../../../sdkjs/word/sdk-all-min.js']);
let dep_scripts = ['../../../vendor/xregexp/xregexp-all-min.js',
- '../../../vendor/sockjs/sockjs.min.js',
- '../../../vendor/jszip/jszip.min.js',
- '../../../vendor/jszip-utils/jszip-utils.min.js'];
+ '../../../vendor/sockjs/sockjs.min.js'];
dep_scripts.push(...window.sdk_scripts);
const promise_get_script = (scriptpath) => {
diff --git a/apps/presentationeditor/main/app.js b/apps/presentationeditor/main/app.js
index e18ce4ee03..089bd69065 100644
--- a/apps/presentationeditor/main/app.js
+++ b/apps/presentationeditor/main/app.js
@@ -54,8 +54,6 @@ require.config({
jmousewheel : '../vendor/perfect-scrollbar/src/jquery.mousewheel',
xregexp : '../vendor/xregexp/xregexp-all-min',
sockjs : '../vendor/sockjs/sockjs.min',
- jszip : '../vendor/jszip/jszip.min',
- jsziputils : '../vendor/jszip-utils/jszip-utils.min',
allfonts : '../../sdkjs/common/AllFonts',
sdk : '../../sdkjs/slide/sdk-all-min',
api : 'api/documents/api',
@@ -108,9 +106,7 @@ require.config({
'underscore',
'allfonts',
'xregexp',
- 'sockjs',
- 'jszip',
- 'jsziputils'
+ 'sockjs'
]
},
gateway: {
diff --git a/apps/presentationeditor/main/app_dev.js b/apps/presentationeditor/main/app_dev.js
index cf86841013..2cf067eaab 100644
--- a/apps/presentationeditor/main/app_dev.js
+++ b/apps/presentationeditor/main/app_dev.js
@@ -54,8 +54,6 @@ require.config({
jmousewheel : '../vendor/perfect-scrollbar/src/jquery.mousewheel',
xregexp : '../vendor/xregexp/xregexp-all-min',
sockjs : '../vendor/sockjs/sockjs.min',
- jszip : '../vendor/jszip/jszip.min',
- jsziputils : '../vendor/jszip-utils/jszip-utils.min',
api : 'api/documents/api',
core : 'common/main/lib/core/application',
notification : 'common/main/lib/core/NotificationCenter',
@@ -121,8 +119,6 @@ require([
'analytics',
'gateway',
'locale',
- 'jszip',
- 'jsziputils',
'sockjs',
'xregexp',
'underscore'
diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json
index 48e4d9b72c..fd5168f264 100644
--- a/apps/presentationeditor/main/locale/en.json
+++ b/apps/presentationeditor/main/locale/en.json
@@ -449,6 +449,7 @@
"Common.Views.Plugins.textLoading": "Loading",
"Common.Views.Plugins.textStart": "Start",
"Common.Views.Plugins.textStop": "Stop",
+ "Common.Views.Plugins.textClosePanel": "Close plugin",
"Common.Views.Protection.hintAddPwd": "Encrypt with password",
"Common.Views.Protection.hintPwd": "Change or delete password",
"Common.Views.Protection.hintSignature": "Add digital signature or signature line",
diff --git a/apps/spreadsheeteditor/embed/index.html b/apps/spreadsheeteditor/embed/index.html
index 99174196f5..01aae56190 100644
--- a/apps/spreadsheeteditor/embed/index.html
+++ b/apps/spreadsheeteditor/embed/index.html
@@ -255,8 +255,6 @@
-
-
-
-
-
-
-
-
diff --git a/apps/spreadsheeteditor/main/app.js b/apps/spreadsheeteditor/main/app.js
index 8fea0368f5..42fff9d895 100644
--- a/apps/spreadsheeteditor/main/app.js
+++ b/apps/spreadsheeteditor/main/app.js
@@ -54,8 +54,6 @@ require.config({
jmousewheel : '../vendor/perfect-scrollbar/src/jquery.mousewheel',
xregexp : '../vendor/xregexp/xregexp-all-min',
sockjs : '../vendor/sockjs/sockjs.min',
- jszip : '../vendor/jszip/jszip.min',
- jsziputils : '../vendor/jszip-utils/jszip-utils.min',
allfonts : '../../sdkjs/common/AllFonts',
sdk : '../../sdkjs/cell/sdk-all-min',
api : 'api/documents/api',
@@ -108,9 +106,7 @@ require.config({
'underscore',
'allfonts',
'xregexp',
- 'sockjs',
- 'jszip',
- 'jsziputils'
+ 'sockjs'
]
},
gateway: {
diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js
index f6aacc4115..92ecc9081a 100644
--- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js
+++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js
@@ -1317,7 +1317,11 @@ define([
},
searchShow: function () {
- if (this.toolbar.btnSearch && this.searchBar && !this.searchBar.isVisible()) {
+ if (this.toolbar.btnSearch) {
+ if (this.searchBar && this.searchBar.isVisible()) {
+ this.searchBar.focus();
+ return;
+ }
this.toolbar.btnSearch.toggle(true);
}
},
diff --git a/apps/spreadsheeteditor/main/app/template/StatusBar.template b/apps/spreadsheeteditor/main/app/template/StatusBar.template
index 68367459bc..e7ab60c192 100644
--- a/apps/spreadsheeteditor/main/app/template/StatusBar.template
+++ b/apps/spreadsheeteditor/main/app/template/StatusBar.template
@@ -7,7 +7,7 @@
diff --git a/apps/spreadsheeteditor/main/app_dev.js b/apps/spreadsheeteditor/main/app_dev.js
index d634c7aa05..af9d5b6f71 100644
--- a/apps/spreadsheeteditor/main/app_dev.js
+++ b/apps/spreadsheeteditor/main/app_dev.js
@@ -54,8 +54,6 @@ require.config({
jmousewheel : '../vendor/perfect-scrollbar/src/jquery.mousewheel',
xregexp : '../vendor/xregexp/xregexp-all-min',
sockjs : '../vendor/sockjs/sockjs.min',
- jszip : '../vendor/jszip/jszip.min',
- jsziputils : '../vendor/jszip-utils/jszip-utils.min',
api : 'api/documents/api',
core : 'common/main/lib/core/application',
notification : 'common/main/lib/core/NotificationCenter',
@@ -121,8 +119,6 @@ require([
'analytics',
'gateway',
'locale',
- 'jszip',
- 'jsziputils',
'sockjs',
'underscore'
], function (Backbone, Bootstrap, Core) {
diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json
index ce4cde935a..da990f93b5 100644
--- a/apps/spreadsheeteditor/main/locale/en.json
+++ b/apps/spreadsheeteditor/main/locale/en.json
@@ -304,6 +304,7 @@
"Common.Views.Plugins.textLoading": "Loading",
"Common.Views.Plugins.textStart": "Start",
"Common.Views.Plugins.textStop": "Stop",
+ "Common.Views.Plugins.textClosePanel": "Close plugin",
"Common.Views.Protection.hintAddPwd": "Encrypt with password",
"Common.Views.Protection.hintPwd": "Change or delete password",
"Common.Views.Protection.hintSignature": "Add digital signature or signature line",
diff --git a/apps/spreadsheeteditor/mobile/src/controller/Main.jsx b/apps/spreadsheeteditor/mobile/src/controller/Main.jsx
index de031d0e1c..de2cd357db 100644
--- a/apps/spreadsheeteditor/mobile/src/controller/Main.jsx
+++ b/apps/spreadsheeteditor/mobile/src/controller/Main.jsx
@@ -71,9 +71,7 @@ class MainController extends Component {
'../../../vendor/bootstrap/dist/js/bootstrap.min.js',
'../../../vendor/underscore/underscore-min.js',
'../../../vendor/xregexp/xregexp-all-min.js',
- '../../../vendor/sockjs/sockjs.min.js',
- '../../../vendor/jszip/jszip.min.js',
- '../../../vendor/jszip-utils/jszip-utils.min.js'];
+ '../../../vendor/sockjs/sockjs.min.js'];
dep_scripts.push(...window.sdk_scripts);
const promise_get_script = (scriptpath) => {
diff --git a/build/Gruntfile.js b/build/Gruntfile.js
index db261ec315..246d2d13da 100644
--- a/build/Gruntfile.js
+++ b/build/Gruntfile.js
@@ -282,8 +282,6 @@ module.exports = function(grunt) {
doRegisterTask('iscroll');
doRegisterTask('fetch');
doRegisterTask('es6-promise');
- doRegisterTask('jszip');
- doRegisterTask('jsziputils');
doRegisterTask('common-embed');
doRegisterTask('requirejs', function(defaultConfig, packageFile) {
return {
@@ -674,8 +672,6 @@ module.exports = function(grunt) {
grunt.registerTask('deploy-iscroll', ['iscroll-init', 'clean', 'copy']);
grunt.registerTask('deploy-fetch', ['fetch-init', 'clean', 'copy']);
grunt.registerTask('deploy-bootstrap', ['bootstrap-init', 'clean', 'copy']);
- grunt.registerTask('deploy-jszip', ['jszip-init', 'clean', 'copy']);
- grunt.registerTask('deploy-jsziputils', ['jsziputils-init', 'clean', 'copy']);
grunt.registerTask('deploy-requirejs', ['requirejs-init', 'clean', 'terser']);
grunt.registerTask('deploy-es6-promise', ['es6-promise-init', 'clean', 'copy']);
grunt.registerTask('deploy-common-embed', ['common-embed-init', 'clean', 'copy']);
diff --git a/build/appforms.json b/build/appforms.json
index 12b4e77c20..7a2f2ed9c8 100644
--- a/build/appforms.json
+++ b/build/appforms.json
@@ -33,8 +33,6 @@
"jmousewheel": "../vendor/perfect-scrollbar/src/jquery.mousewheel",
"xregexp": "empty:",
"sockjs": "empty:",
- "jszip": "empty:",
- "jszip-utils": "empty:",
"coapisettings": "empty:",
"allfonts": "empty:",
"sdk": "empty:",
@@ -87,9 +85,7 @@
"coapisettings",
"allfonts",
"xregexp",
- "sockjs",
- "jszip",
- "jszip-utils"
+ "sockjs"
]
},
"gateway": {
diff --git a/build/common.json b/build/common.json
index 2dd34ff01d..ce6987efa7 100644
--- a/build/common.json
+++ b/build/common.json
@@ -202,28 +202,6 @@
}
}
},
- "jszip": {
- "clean": [
- "../deploy/web-apps/vendor/jszip"
- ],
- "copy": {
- "script": {
- "src": "../vendor/jszip/jszip.min.js",
- "dest": "../deploy/web-apps/vendor/jszip/jszip.min.js"
- }
- }
- },
- "jsziputils": {
- "clean": [
- "../deploy/web-apps/vendor/jszip-utils"
- ],
- "copy": {
- "script": {
- "src": "../vendor/jszip-utils/jszip-utils.min.js",
- "dest": "../deploy/web-apps/vendor/jszip-utils/jszip-utils.min.js"
- }
- }
- },
"underscore": {
"clean": [
"../deploy/web-apps/vendor/underscore"
@@ -303,8 +281,6 @@
"deploy-bootstrap",
"deploy-iscroll",
"deploy-fetch",
- "deploy-jszip",
- "deploy-jsziputils",
"deploy-es6-promise",
"deploy-common-embed"
]
diff --git a/build/documenteditor.json b/build/documenteditor.json
index 47cfe95a90..249a386668 100644
--- a/build/documenteditor.json
+++ b/build/documenteditor.json
@@ -31,8 +31,6 @@
"jmousewheel": "../vendor/perfect-scrollbar/src/jquery.mousewheel",
"xregexp": "empty:",
"sockjs": "empty:",
- "jszip": "empty:",
- "jszip-utils": "empty:",
"coapisettings": "empty:",
"allfonts": "empty:",
"sdk": "empty:",
@@ -85,9 +83,7 @@
"coapisettings",
"allfonts",
"xregexp",
- "sockjs",
- "jszip",
- "jszip-utils"
+ "sockjs"
]
},
"gateway": {
diff --git a/build/presentationeditor.json b/build/presentationeditor.json
index 5531492f2e..209a62b4de 100644
--- a/build/presentationeditor.json
+++ b/build/presentationeditor.json
@@ -31,8 +31,6 @@
"jmousewheel": "../vendor/perfect-scrollbar/src/jquery.mousewheel",
"xregexp": "empty:",
"sockjs": "empty:",
- "jszip": "empty:",
- "jszip-utils": "empty:",
"coapisettings": "empty:",
"allfonts": "empty:",
"sdk": "empty:",
@@ -85,9 +83,7 @@
"coapisettings",
"allfonts",
"xregexp",
- "sockjs",
- "jszip",
- "jszip-utils"
+ "sockjs"
]
},
"gateway": {
diff --git a/build/spreadsheeteditor.json b/build/spreadsheeteditor.json
index 11c4e50a7c..267dc61ad8 100644
--- a/build/spreadsheeteditor.json
+++ b/build/spreadsheeteditor.json
@@ -31,8 +31,6 @@
"jmousewheel": "../vendor/perfect-scrollbar/src/jquery.mousewheel",
"xregexp": "empty:",
"sockjs": "empty:",
- "jszip": "empty:",
- "jszip-utils": "empty:",
"coapisettings": "empty:",
"allfonts": "empty:",
"sdk": "empty:",
@@ -85,9 +83,7 @@
"coapisettings",
"allfonts",
"xregexp",
- "sockjs",
- "jszip",
- "jszip-utils"
+ "sockjs"
]
},
"gateway": {
diff --git a/test/spreadsheeteditor/main/index.html b/test/spreadsheeteditor/main/index.html
index f36a0cf78e..9ee008707f 100644
--- a/test/spreadsheeteditor/main/index.html
+++ b/test/spreadsheeteditor/main/index.html
@@ -116,9 +116,6 @@
-
-
-