',
'
',
'
',
'name="<%= name %>" ',
'spellcheck="<%= spellcheck %>" ',
'class="form-control <%= cls %>" ',
@@ -562,6 +549,7 @@ define([
style: '',
value: '',
name: '',
+ type: 'password',
validation: null,
allowBlank: true,
placeHolder: '',
@@ -594,7 +582,6 @@ define([
Common.UI.InputFieldBtn.prototype.render.call(this, parentEl);
this._btnElm = this._button.$el;
- this._input.on('input', _.bind(this.checkPasswordType, this));
if(this.options.showPwdOnClick)
this._button.on('click', _.bind(this.passwordClick, this));
else
@@ -647,10 +634,10 @@ define([
this._button.setIconCls(this.options.showCls);
this.type = 'password';
- (this._input.val() !== '') && this._input.attr('type', this.type);
+ this._input.attr('type', this.type);
if(this.repeatInput) {
this.repeatInput.type = this.type;
- (this.repeatInput._input.val() !== '') && this.repeatInput._input.attr('type', this.type);
+ this.repeatInput._input.attr('type', this.type);
}
if(this.options.showPwdOnClick) {
diff --git a/apps/common/main/lib/controller/Desktop.js b/apps/common/main/lib/controller/Desktop.js
index 357502c19..9d4ec992f 100644
--- a/apps/common/main/lib/controller/Desktop.js
+++ b/apps/common/main/lib/controller/Desktop.js
@@ -60,10 +60,12 @@ define([
'btn-save-coauth': 'coauth',
'btn-synch': 'synch' };
- var is_win_xp = window.RendererProcessVariable && window.RendererProcessVariable.os === 'winxp';
+ var nativevars;
if ( !!native ) {
native.features = native.features || {};
+ nativevars = window.RendererProcessVariable;
+
window.on_native_message = function (cmd, param) {
if (/^style:change/.test(cmd)) {
var obj = JSON.parse(param);
@@ -139,7 +141,7 @@ define([
}
} else
if (/althints:show/.test(cmd)) {
- if ( param == /false|hide/.test(param) )
+ if ( /false|hide/.test(param) )
Common.NotificationCenter.trigger('hints:clear');
}
};
@@ -207,6 +209,8 @@ define([
_.extend(config, opts);
if ( config.isDesktopApp ) {
+ let is_win_xp = nativevars && nativevars.os === 'winxp';
+
Common.UI.Themes.setAvailable(!is_win_xp);
Common.NotificationCenter.on('app:ready', function (opts) {
_.extend(config, opts);
@@ -341,6 +345,15 @@ define([
return native[name].apply(this, args);
}
},
+ helpUrl: function () {
+ if ( !!nativevars && nativevars.helpUrl ) {
+ var webapp = window.SSE ? 'spreadsheeteditor' :
+ window.PE ? 'presentationeditor' : 'documenteditor';
+ return nativevars.helpUrl + webapp + '/main/resources/help';
+ }
+
+ return undefined;
+ }
};
};
diff --git a/apps/common/main/lib/controller/Themes.js b/apps/common/main/lib/controller/Themes.js
index a25ad217a..732e497a0 100644
--- a/apps/common/main/lib/controller/Themes.js
+++ b/apps/common/main/lib/controller/Themes.js
@@ -39,7 +39,8 @@ define([
}
if ( !!window.currentLoaderTheme ) {
- themes_map[currentLoaderTheme.id] = {};
+ if ( !themes_map[currentLoaderTheme.id] )
+ themes_map[currentLoaderTheme.id] = currentLoaderTheme;
window.currentLoaderTheme = undefined;
}
@@ -208,6 +209,8 @@ define([
themes_map[obj.id] = {text: theme_label, type: obj.type};
write_theme_css( create_colors_css(obj.id, obj.colors) );
}
+
+ Common.NotificationCenter.trigger('uitheme:countchanged');
}
var get_themes_config = function (url) {
@@ -446,6 +449,7 @@ define([
var theme_obj = {
id: id,
type: obj.type,
+ text: themes_map[id].text,
};
if ( themes_map[id].source != 'static' ) {
diff --git a/apps/common/main/lib/core/keymaster.js b/apps/common/main/lib/core/keymaster.js
index 29a5b1502..9cf5a0ee6 100644
--- a/apps/common/main/lib/core/keymaster.js
+++ b/apps/common/main/lib/core/keymaster.js
@@ -36,7 +36,8 @@
return _MAP[x] || x.toUpperCase().charCodeAt(0);
},
_downKeys = [];
- var locked;
+ var locked,
+ propagate;
for(k=1;k<20;k++) _MAP['f'+k] = 111+k;
@@ -116,6 +117,8 @@
// call the handler and stop the event if neccessary
if((handler.mods.length == 0 && !_mods[16] && !_mods[18] && !_mods[17] && !_mods[91]) || modifiersMatch){
if(locked===true || handler.locked || handler.method(event, handler)===false){
+ if (locked===true && propagate || handler.locked && handler.propagate)
+ continue;
if(event.preventDefault) event.preventDefault();
else event.returnValue = false;
if(event.stopPropagation) event.stopPropagation();
@@ -188,8 +191,8 @@
if (keys.length > 1) {
mods = getMods(keys);
- key = keys[keys.length - 1];
}
+ (keys.length > 0) && (key = keys[keys.length - 1]);
key = code(key);
@@ -301,8 +304,8 @@
if (keys.length > 1) {
mods = getMods(keys);
- key = keys[keys.length - 1];
}
+ (keys.length > 0) && (key = keys[keys.length - 1]);
key = code(key);
@@ -320,12 +323,23 @@
}
}
- function suspend(key, scope) {
- key ? setKeyOptions(key, scope, 'locked', true) : (locked = true);
+ function suspend(key, scope, pass) {
+ if (key) {
+ setKeyOptions(key, scope, 'locked', true)
+ pass && setKeyOptions(key, scope, 'propagate', true)
+ } else {
+ locked = true;
+ pass && (propagate = true);
+ }
}
- function resume(key, scope) {
- key ? setKeyOptions(key, scope, 'locked', false) : (locked = false);
+ function resume(key, scope) {
+ if (key) {
+ setKeyOptions(key, scope, 'locked', false)
+ setKeyOptions(key, scope, 'propagate', false)
+ } else {
+ locked = propagate = false;
+ }
}
// set window.key and window.key.set/get/deleteScope, and the default filter
diff --git a/apps/common/main/lib/util/Shortcuts.js b/apps/common/main/lib/util/Shortcuts.js
index f34ae1ce5..de36581ce 100644
--- a/apps/common/main/lib/util/Shortcuts.js
+++ b/apps/common/main/lib/util/Shortcuts.js
@@ -148,8 +148,8 @@ Common.util = Common.util||{};
}
},
- suspendEvents: function(key,scope) {
- window.key.suspend(key,scope);
+ suspendEvents: function(key,scope,propagate) {
+ window.key.suspend(key,scope,propagate);
},
resumeEvents: function(key,scope) {
diff --git a/apps/common/main/lib/view/About.js b/apps/common/main/lib/view/About.js
index 04f3530eb..8bdf0c190 100644
--- a/apps/common/main/lib/view/About.js
+++ b/apps/common/main/lib/view/About.js
@@ -126,6 +126,12 @@ define([
'
',
'',
'',
+ '
',
+ '| ',
+ '',
+ '',
+ ' | ',
+ '
',
'
',
'',
'',
@@ -177,6 +183,7 @@ define([
this.lblCompanyMail = _$l.findById('#id-about-company-mail');
this.lblCompanyUrl = _$l.findById('#id-about-company-url');
this.lblCompanyLic = _$l.findById('#id-about-company-lic');
+ this.lblCompanyTel = _$l.findById('#id-about-company-tel');
this.$el.html(_$l);
this.$el.addClass('about-dlg');
@@ -224,6 +231,11 @@ define([
this.lblCompanyMail.attr('href', "mailto:"+value).text(value) :
this.lblCompanyMail.parents('tr').addClass('hidden');
+ value = customer.phone;
+ value && value.length ?
+ this.lblCompanyTel.text(value) :
+ this.lblCompanyTel.parents('tr').addClass('hidden');
+
if ((value = customer.www) && value.length) {
var http = !/^https?:\/{2}/i.test(value) ? "http:\/\/" : '';
this.lblCompanyUrl.attr('href', http+value).text(value);
diff --git a/apps/common/main/lib/view/History.js b/apps/common/main/lib/view/History.js
index 5c79d22b9..b8ec54273 100644
--- a/apps/common/main/lib/view/History.js
+++ b/apps/common/main/lib/view/History.js
@@ -68,11 +68,14 @@ define([
initialize: function(options) {
_.extend(this, options);
Common.UI.BaseView.prototype.initialize.call(this, arguments);
+
+ var filter = Common.localStorage.getKeysFilter();
+ this.appPrefix = (filter && filter.length) ? filter.split(',')[0] : '';
},
render: function(el) {
el = el || this.el;
- $(el).html(this.template({scope: this})).width( (parseInt(Common.localStorage.getItem('de-mainmenu-width')) || MENU_SCALE_PART) - SCALE_MIN);
+ $(el).html(this.template({scope: this})).width( (parseInt(Common.localStorage.getItem(this.appPrefix + 'mainmenu-width')) || MENU_SCALE_PART) - SCALE_MIN);
this.viewHistoryList = new Common.UI.DataView({
el: $('#history-list'),
diff --git a/apps/common/main/lib/view/SearchBar.js b/apps/common/main/lib/view/SearchBar.js
index ec1fe6c6d..7942c985c 100644
--- a/apps/common/main/lib/view/SearchBar.js
+++ b/apps/common/main/lib/view/SearchBar.js
@@ -39,7 +39,8 @@
*/
define([
- 'common/main/lib/component/Window'
+ 'common/main/lib/component/Window',
+ 'common/main/lib/component/Button'
], function () {
'use strict';
@@ -70,6 +71,7 @@ define([
].join('');
this.options.tpl = _.template(this.template)(this.options);
+ this.iconType = this.options.iconType;
Common.UI.Window.prototype.initialize.call(this, this.options);
@@ -91,7 +93,7 @@ define([
this.btnBack = new Common.UI.Button({
parentEl: $('#search-bar-back'),
cls: 'btn-toolbar',
- iconCls: 'toolbar__icon btn-arrow-up',
+ iconCls: this.iconType === 'svg' ? 'svg-icon search-arrow-up' : 'toolbar__icon btn-arrow-up',
hint: this.tipPreviousResult
});
this.btnBack.on('click', _.bind(this.onBtnNextClick, this, 'back'));
@@ -99,7 +101,7 @@ define([
this.btnNext = new Common.UI.Button({
parentEl: $('#search-bar-next'),
cls: 'btn-toolbar',
- iconCls: 'toolbar__icon btn-arrow-down',
+ iconCls: this.iconType === 'svg' ? 'svg-icon search-arrow-down' : 'toolbar__icon btn-arrow-down',
hint: this.tipNextResult
});
this.btnNext.on('click', _.bind(this.onBtnNextClick, this, 'next'));
@@ -117,7 +119,7 @@ define([
this.btnClose = new Common.UI.Button({
parentEl: $('#search-bar-close'),
cls: 'btn-toolbar',
- iconCls: 'toolbar__icon btn-close',
+ iconCls: this.iconType === 'svg' ? 'svg-icon search-close' : 'toolbar__icon btn-close',
hint: this.tipCloseSearch
});
this.btnClose.on('click', _.bind(function () {
@@ -132,7 +134,7 @@ define([
},
show: function(text) {
- var top = $('#app-title').height() + $('#toolbar').height() + 2,
+ var top = ($('#app-title').length > 0 ? $('#app-title').height() : 0) + $('#toolbar').height() + 2,
left = Common.Utils.innerWidth() - ($('#right-menu').is(':visible') ? $('#right-menu').width() : 0) - this.options.width - 32;
Common.UI.Window.prototype.show.call(this, left, top);
diff --git a/apps/documenteditor/main/resources/help/de/images/3dchart.png b/apps/common/main/resources/help/de/images/3dchart.png
similarity index 100%
rename from apps/documenteditor/main/resources/help/de/images/3dchart.png
rename to apps/common/main/resources/help/de/images/3dchart.png
diff --git a/apps/documenteditor/main/resources/help/de/images/autocorrect.png b/apps/common/main/resources/help/de/images/autocorrect.png
similarity index 100%
rename from apps/documenteditor/main/resources/help/de/images/autocorrect.png
rename to apps/common/main/resources/help/de/images/autocorrect.png
diff --git a/apps/documenteditor/main/resources/help/de/images/chart_type_settings.png b/apps/common/main/resources/help/de/images/chart_type_settings.png
similarity index 100%
rename from apps/documenteditor/main/resources/help/de/images/chart_type_settings.png
rename to apps/common/main/resources/help/de/images/chart_type_settings.png
diff --git a/apps/documenteditor/main/resources/help/de/images/chartdata.png b/apps/common/main/resources/help/de/images/chartdata.png
similarity index 100%
rename from apps/documenteditor/main/resources/help/de/images/chartdata.png
rename to apps/common/main/resources/help/de/images/chartdata.png
diff --git a/apps/documenteditor/main/resources/help/de/images/charteditor.png b/apps/common/main/resources/help/de/images/charteditor.png
similarity index 100%
rename from apps/documenteditor/main/resources/help/de/images/charteditor.png
rename to apps/common/main/resources/help/de/images/charteditor.png
diff --git a/apps/documenteditor/main/resources/help/de/images/chartsettings_alternativetext.png b/apps/common/main/resources/help/de/images/chartsettings_alternativetext.png
similarity index 100%
rename from apps/documenteditor/main/resources/help/de/images/chartsettings_alternativetext.png
rename to apps/common/main/resources/help/de/images/chartsettings_alternativetext.png
diff --git a/apps/documenteditor/main/resources/help/de/images/chartsettings_cellsnapping.png b/apps/common/main/resources/help/de/images/chartsettings_cellsnapping.png
similarity index 100%
rename from apps/documenteditor/main/resources/help/de/images/chartsettings_cellsnapping.png
rename to apps/common/main/resources/help/de/images/chartsettings_cellsnapping.png
diff --git a/apps/documenteditor/main/resources/help/de/images/chartsettings_horizontalaxis.png b/apps/common/main/resources/help/de/images/chartsettings_horizontalaxis.png
similarity index 100%
rename from apps/documenteditor/main/resources/help/de/images/chartsettings_horizontalaxis.png
rename to apps/common/main/resources/help/de/images/chartsettings_horizontalaxis.png
diff --git a/apps/documenteditor/main/resources/help/de/images/chartsettings_layout.png b/apps/common/main/resources/help/de/images/chartsettings_layout.png
similarity index 100%
rename from apps/documenteditor/main/resources/help/de/images/chartsettings_layout.png
rename to apps/common/main/resources/help/de/images/chartsettings_layout.png
diff --git a/apps/documenteditor/main/resources/help/de/images/chartsettings_secondaryaxis1.png b/apps/common/main/resources/help/de/images/chartsettings_secondaryaxis1.png
similarity index 100%
rename from apps/documenteditor/main/resources/help/de/images/chartsettings_secondaryaxis1.png
rename to apps/common/main/resources/help/de/images/chartsettings_secondaryaxis1.png
diff --git a/apps/documenteditor/main/resources/help/de/images/chartsettings_secondaryaxis2.png b/apps/common/main/resources/help/de/images/chartsettings_secondaryaxis2.png
similarity index 100%
rename from apps/documenteditor/main/resources/help/de/images/chartsettings_secondaryaxis2.png
rename to apps/common/main/resources/help/de/images/chartsettings_secondaryaxis2.png
diff --git a/apps/documenteditor/main/resources/help/de/images/chartsettings_verticalaxis.png b/apps/common/main/resources/help/de/images/chartsettings_verticalaxis.png
similarity index 100%
rename from apps/documenteditor/main/resources/help/de/images/chartsettings_verticalaxis.png
rename to apps/common/main/resources/help/de/images/chartsettings_verticalaxis.png
diff --git a/apps/documenteditor/main/resources/help/de/images/charttype.png b/apps/common/main/resources/help/de/images/charttype.png
similarity index 100%
rename from apps/documenteditor/main/resources/help/de/images/charttype.png
rename to apps/common/main/resources/help/de/images/charttype.png
diff --git a/apps/documenteditor/main/resources/help/de/images/charttype_combo.png b/apps/common/main/resources/help/de/images/charttype_combo.png
similarity index 100%
rename from apps/documenteditor/main/resources/help/de/images/charttype_combo.png
rename to apps/common/main/resources/help/de/images/charttype_combo.png
diff --git a/apps/documenteditor/main/resources/help/de/images/charttypebutton.png b/apps/common/main/resources/help/de/images/charttypebutton.png
similarity index 100%
rename from apps/documenteditor/main/resources/help/de/images/charttypebutton.png
rename to apps/common/main/resources/help/de/images/charttypebutton.png
diff --git a/apps/documenteditor/main/resources/help/de/images/coeditingmodemenu.png b/apps/common/main/resources/help/de/images/coeditingmodemenu.png
similarity index 100%
rename from apps/documenteditor/main/resources/help/de/images/coeditingmodemenu.png
rename to apps/common/main/resources/help/de/images/coeditingmodemenu.png
diff --git a/apps/documenteditor/main/resources/help/de/images/document_language_window.png b/apps/common/main/resources/help/de/images/document_language_window.png
similarity index 100%
rename from apps/documenteditor/main/resources/help/de/images/document_language_window.png
rename to apps/common/main/resources/help/de/images/document_language_window.png
diff --git a/apps/documenteditor/main/resources/help/de/images/editseries.png b/apps/common/main/resources/help/de/images/editseries.png
similarity index 100%
rename from apps/documenteditor/main/resources/help/de/images/editseries.png
rename to apps/common/main/resources/help/de/images/editseries.png
diff --git a/apps/documenteditor/main/resources/help/de/images/hyperlinkwindow.png b/apps/common/main/resources/help/de/images/hyperlinkwindow.png
similarity index 100%
rename from apps/documenteditor/main/resources/help/de/images/hyperlinkwindow.png
rename to apps/common/main/resources/help/de/images/hyperlinkwindow.png
diff --git a/apps/documenteditor/main/resources/help/de/images/numberformat.png b/apps/common/main/resources/help/de/images/numberformat.png
similarity index 100%
rename from apps/documenteditor/main/resources/help/de/images/numberformat.png
rename to apps/common/main/resources/help/de/images/numberformat.png
diff --git a/apps/documenteditor/main/resources/help/de/images/palette_custom.png b/apps/common/main/resources/help/de/images/palette_custom.png
similarity index 100%
rename from apps/documenteditor/main/resources/help/de/images/palette_custom.png
rename to apps/common/main/resources/help/de/images/palette_custom.png
diff --git a/apps/documenteditor/main/resources/help/de/images/selectdata.png b/apps/common/main/resources/help/de/images/selectdata.png
similarity index 100%
rename from apps/documenteditor/main/resources/help/de/images/selectdata.png
rename to apps/common/main/resources/help/de/images/selectdata.png
diff --git a/apps/documenteditor/main/resources/help/de/images/setpassword.png b/apps/common/main/resources/help/de/images/setpassword.png
similarity index 100%
rename from apps/documenteditor/main/resources/help/de/images/setpassword.png
rename to apps/common/main/resources/help/de/images/setpassword.png
diff --git a/apps/common/main/resources/help/download.html b/apps/common/main/resources/help/download.html
new file mode 100644
index 000000000..6bebaa2aa
--- /dev/null
+++ b/apps/common/main/resources/help/download.html
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+ There is no help installed
+
+
+ {phoneCustomer}
+
+ ) : null}
+
{urlCustomer && urlCustomer.length ? (
-
of 0
diff --git a/apps/documenteditor/embed/index.html.deploy b/apps/documenteditor/embed/index.html.deploy
index 0bf2894db..0bc36adf3 100644
--- a/apps/documenteditor/embed/index.html.deploy
+++ b/apps/documenteditor/embed/index.html.deploy
@@ -190,7 +190,6 @@
-
of 0
diff --git a/apps/documenteditor/embed/js/ApplicationController.js b/apps/documenteditor/embed/js/ApplicationController.js
index 35b006854..2df136dcf 100644
--- a/apps/documenteditor/embed/js/ApplicationController.js
+++ b/apps/documenteditor/embed/js/ApplicationController.js
@@ -401,7 +401,6 @@ DE.ApplicationController = new(function(){
if ( permissions.print === false) {
$('#idt-print').hide();
- $(dividers[0]).hide();
itemsCount--;
}
@@ -413,8 +412,6 @@ DE.ApplicationController = new(function(){
if ( !appOptions.canFillForms || permissions.download === false) {
$('#idt-download-docx').hide();
$('#idt-download-pdf').hide();
- $(dividers[0]).hide();
- $(dividers[1]).hide();
itemsCount -= 2;
}
@@ -428,8 +425,10 @@ DE.ApplicationController = new(function(){
itemsCount--;
}
- if (itemsCount<3)
- $(dividers[2]).hide();
+ if (itemsCount < 7) {
+ $(dividers[0]).hide();
+ $(dividers[1]).hide();
+ }
if ( !embedConfig.embedUrl || appOptions.canFillForms) {
$('#idt-embed').hide();
@@ -451,10 +450,6 @@ DE.ApplicationController = new(function(){
embed: '#idt-embed'
});
- common.controller.SearchBar.attach({
- search: '#id-search'
- });
-
api.asc_registerCallback('asc_onStartAction', onLongActionBegin);
api.asc_registerCallback('asc_onEndAction', onLongActionEnd);
api.asc_registerCallback('asc_onMouseMoveStart', onDocMouseMoveStart);
@@ -524,6 +519,11 @@ DE.ApplicationController = new(function(){
downloadAs(Asc.c_oAscFileType.PDF);
});
+ DE.ApplicationView.tools.get('#idt-search')
+ .on('click', function(){
+ common.controller.SearchBar.show();
+ });
+
$('#id-btn-zoom-in').on('click', api.zoomIn.bind(this));
$('#id-btn-zoom-out').on('click', api.zoomOut.bind(this));
diff --git a/apps/documenteditor/embed/js/ApplicationView.js b/apps/documenteditor/embed/js/ApplicationView.js
index 0f74bdaf0..5ef35c142 100644
--- a/apps/documenteditor/embed/js/ApplicationView.js
+++ b/apps/documenteditor/embed/js/ApplicationView.js
@@ -46,11 +46,12 @@ DE.ApplicationView = new(function(){
$btnTools.addClass('dropdown-toggle').attr('data-toggle', 'dropdown').attr('aria-expanded', 'true');
$btnTools.parent().append(
'
|