Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[common] Update bootstrap (dropdown menu, hidden class changed to d-none class)

Browse source
This commit is contained in:
JuliaSvinareva 2020-09-11 19:30:28 +03:00
parent 1b2b5ff36a
commit 99371dd9d4
47 changed files with 188 additions and 166 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/common/main/lib/component/Button.js
View file

@ -676,7 +676,7 @@ define([
}, },
setVisible: function(visible) { setVisible: function(visible) {
if (this.cmpEl) this.cmpEl.toggleClass('hidden', !visible); if (this.cmpEl) this.cmpEl.toggleClass('d-none', !visible);
this.visible = visible; this.visible = visible;
}, },

4
apps/common/main/lib/component/ComboBorderSize.js
View file

@ -79,10 +79,10 @@ define([
'<div class="input-group combobox combo-border-size input-group-nr <%= cls %>" id="<%= id %>" style="<%= style %>">', '<div class="input-group combobox combo-border-size input-group-nr <%= cls %>" id="<%= id %>" style="<%= style %>">',
'<div class="form-control" style="padding-top:2px; <%= style %>"></div>', '<div class="form-control" style="padding-top:2px; <%= style %>"></div>',
'<div style="display: table-cell;"></div>', '<div style="display: table-cell;"></div>',
'<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"><span class="caret img-commonctrl"></span></button>', '<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" data-reference="parent"><span class="caret img-commonctrl"></span></button>',
'<ul class="dropdown-menu <%= menuCls %>" style="<%= menuStyle %>" role="menu">', '<ul class="dropdown-menu <%= menuCls %>" style="<%= menuStyle %>" role="menu">',
'<% _.each(items, function(item) { %>', '<% _.each(items, function(item) { %>',
'<li id="<%= item.id %>" data-value="<%= item.value %>"><a tabindex="-1" type="menuitem">', '<li id="<%= item.id %>" class="dropdown-item" data-value="<%= item.value %>"><a tabindex="-1" type="menuitem">',
'<span><%= item.displayValue %></span>', '<span><%= item.displayValue %></span>',
'<% if (item.offsety!==undefined) { %>', '<% if (item.offsety!==undefined) { %>',
'<img src="data:image/gif;base64,R0lGODlhAQABAID/AMDAwAAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==" align="right" style="background-position: 0 -<%= item.offsety %>px;">', '<img src="data:image/gif;base64,R0lGODlhAQABAID/AMDAwAAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==" align="right" style="background-position: 0 -<%= item.offsety %>px;">',

78
apps/common/main/lib/component/Menu.js
View file

@ -187,7 +187,7 @@ define([
new Common.UI.MenuItem(_.extend({ new Common.UI.MenuItem(_.extend({
tagName : 'li', tagName : 'li',
template: me.itemTemplate, template: me.itemTemplate,
clsDropdownItem: me.clsDropdownItem clsDropdownItem: item.clsDropdownItem
}, item)) }, item))
); );
} }
@ -254,13 +254,6 @@ define([
}); });
} }
menuRoot.css({
position : 'fixed',
right : 'auto',
left : -1000,
top : -1000
});
this.parentEl = menuRoot.parent(); this.parentEl = menuRoot.parent();
this.parentEl.on('show.bs.dropdown', _.bind(me.onBeforeShowMenu, me)); this.parentEl.on('show.bs.dropdown', _.bind(me.onBeforeShowMenu, me));
@ -512,7 +505,7 @@ define([
setOffset: function(offsetX, offsetY) { setOffset: function(offsetX, offsetY) {
this.offset[0] = _.isUndefined(offsetX) ? this.offset[0] : offsetX; this.offset[0] = _.isUndefined(offsetX) ? this.offset[0] : offsetX;
this.offset[1] = _.isUndefined(offsetY) ? this.offset[1] : offsetY; this.offset[1] = _.isUndefined(offsetY) ? this.offset[1] : offsetY;
this.alignPosition(); //this.alignPosition();
}, },
getOffset: function() { getOffset: function() {
@ -546,14 +539,13 @@ define([
var left = offset.left - posMenu[m[1]][0] + posParent[m[2]][0] + this.offset[0]; var left = offset.left - posMenu[m[1]][0] + posParent[m[2]][0] + this.offset[0];
var top = offset.top - posMenu[m[1]][1] + posParent[m[2]][1] + this.offset[1]; var top = offset.top - posMenu[m[1]][1] + posParent[m[2]][1] + this.offset[1];
if (left + menuW > docW) if (menuParent.is('li.dropdown-submenu')) {
if (menuParent.is('li.dropdown-submenu')) { if (left + menuW > docW) {
left = offset.left - menuW + 2; menuParent.addClass('dropleft');
} else { } else {
left = docW - menuW; menuParent.addClass('dropright');
} }
if (left < 0) }
left = 0;
if (this.options.restoreHeight) { if (this.options.restoreHeight) {
if (typeof (this.options.restoreHeight) == "number") { if (typeof (this.options.restoreHeight) == "number") {
@ -574,25 +566,32 @@ define([
} else { } else {
var cg = Common.Utils.croppedGeometry(); var cg = Common.Utils.croppedGeometry();
docH = cg.height - 10; docH = cg.height - 10;
if (top + menuH > docH) { var newTop = top;
if (top + menuH > docH + cg.top) {
if (fixedAlign && typeof fixedAlign == 'string') { // how to align if menu height > window height if (fixedAlign && typeof fixedAlign == 'string') { // how to align if menu height > window height
m = fixedAlign.match(/^([a-z]+)-([a-z]+)/); m = fixedAlign.match(/^([a-z]+)-([a-z]+)/);
top = offset.top - posMenu[m[1]][1] + posParent[m[2]][1] + this.offset[1] + (fixedOffset || 0); newTop = offset.top - posMenu[m[1]][1] + posParent[m[2]][1] + this.offset[1] + (fixedOffset || 0);
} else } else
top = docH - menuH; newTop = docH - menuH;
} }
if (top < cg.top) if (newTop < cg.top)
top = cg.top; newTop = cg.top;
var margin = newTop - top;
if (Math.abs(margin) > 1) {
menuRoot.css({'margin-top': margin});
}
} }
if (this.options.additionalAlign)
if (this.options.additionalAlign) {
this.options.additionalAlign.call(this, menuRoot, left, top); this.options.additionalAlign.call(this, menuRoot, left, top);
else { } else {
var _css = {left: Math.ceil(left), top: Math.ceil(top)}; /*var _css = {top: Math.ceil(newTop)};
if (!(menuH < docH)) _css['margin-top'] = 0; if (!(menuH < docH)) _css['margin-top'] = 0;
menuRoot.css(_css); menuRoot.css(_css);*/
} }
}, },
@ -716,13 +715,6 @@ define([
}); });
} }
menuRoot.css({
position : 'fixed',
right : 'auto',
left : -1000,
top : -1000
});
this.parentEl = menuRoot.parent(); this.parentEl = menuRoot.parent();
this.parentEl.on('show.bs.dropdown', _.bind(me.onBeforeShowMenu, me)); this.parentEl.on('show.bs.dropdown', _.bind(me.onBeforeShowMenu, me));
@ -858,7 +850,7 @@ define([
onBeforeShowMenu: function(e) { onBeforeShowMenu: function(e) {
Common.NotificationCenter.trigger('menu:show'); Common.NotificationCenter.trigger('menu:show');
this.trigger('show:before', this, e); this.trigger('show:before', this, e);
this.alignPosition(); //this.alignPosition();
}, },
onAfterShowMenu: function(e) { onAfterShowMenu: function(e) {
@ -974,7 +966,7 @@ define([
setOffset: function(offsetX, offsetY) { setOffset: function(offsetX, offsetY) {
this.offset[0] = _.isUndefined(offsetX) ? this.offset[0] : offsetX; this.offset[0] = _.isUndefined(offsetX) ? this.offset[0] : offsetX;
this.offset[1] = _.isUndefined(offsetY) ? this.offset[1] : offsetY; this.offset[1] = _.isUndefined(offsetY) ? this.offset[1] : offsetY;
this.alignPosition(); //this.alignPosition();
}, },
getOffset: function() { getOffset: function() {
@ -1008,14 +1000,22 @@ define([
var left = offset.left - posMenu[m[1]][0] + posParent[m[2]][0] + this.offset[0]; var left = offset.left - posMenu[m[1]][0] + posParent[m[2]][0] + this.offset[0];
var top = offset.top - posMenu[m[1]][1] + posParent[m[2]][1] + this.offset[1]; var top = offset.top - posMenu[m[1]][1] + posParent[m[2]][1] + this.offset[1];
if (left + menuW > docW) if (menuParent.is('li.dropdown-submenu')) {
if (left + menuW > docW) {
menuParent.addClass('dropleft');
} else {
menuParent.addClass('dropright');
}
}
/*if (left + menuW > docW)
if (menuParent.is('li.dropdown-submenu')) { if (menuParent.is('li.dropdown-submenu')) {
left = offset.left - menuW + 2; left = offset.left - menuW + 2;
} else { } else {
left = docW - menuW; left = docW - menuW;
} }*/
if (this.options.restoreHeight) { /*if (this.options.restoreHeight) {
if (typeof (this.options.restoreHeight) == "number") { if (typeof (this.options.restoreHeight) == "number") {
if (top + menuH > docH) { if (top + menuH > docH) {
menuRoot.css('max-height', (docH - top) + 'px'); menuRoot.css('max-height', (docH - top) + 'px');
@ -1040,12 +1040,12 @@ define([
if (top < 0) if (top < 0)
top = 0; top = 0;
} }*/
if (this.options.additionalAlign) /*if (this.options.additionalAlign)
this.options.additionalAlign.call(this, menuRoot, left, top); this.options.additionalAlign.call(this, menuRoot, left, top);
else else
menuRoot.css({left: Math.ceil(left), top: Math.ceil(top)}); menuRoot.css({left: Math.ceil(left), top: Math.ceil(top)});*/
}, },
clearAll: function() { clearAll: function() {

7
apps/common/main/lib/component/MenuItem.js
View file

@ -108,7 +108,7 @@ define([
tagName : 'li', tagName : 'li',
template: _.template([ template: _.template([
'<a id="<%= id %>" style="<%= style %>" <% if(options.canFocused) { %> tabindex="-1" type="menuitem" <% }; if(!_.isUndefined(options.stopPropagation)) { %> data-stopPropagation="true" <% }; %> >', '<a id="<%= id %>" style="<%= style %>" <% if(menu) { %> data-toggle="dropdown" class="dropdown-toggle" <% } %> <% if(options.canFocused) { %> tabindex="-1" type="menuitem" <% }; if(!_.isUndefined(options.stopPropagation)) { %> data-stopPropagation="true" <% }; %> >',
'<% if (!_.isEmpty(iconCls)) { %>', '<% if (!_.isEmpty(iconCls)) { %>',
'<span class="menu-item-icon <%= iconCls %>"></span>', '<span class="menu-item-icon <%= iconCls %>"></span>',
'<% } %>', '<% } %>',
@ -164,14 +164,15 @@ define([
caption : me.caption, caption : me.caption,
iconCls : me.iconCls, iconCls : me.iconCls,
style : me.style, style : me.style,
options : me.options options : me.options,
menu : me.menu
})); }));
if (me.menu) { if (me.menu) {
el.addClass('dropdown-submenu'); el.addClass('dropdown-submenu');
me.menu.render(el); me.menu.render(el);
el.mouseenter(_.bind(me.menu.alignPosition, me.menu)); //el.mouseenter(_.bind(me.menu.alignPosition, me.menu));
// el.focusin(_.bind(me.onFocusItem, me)); // el.focusin(_.bind(me.onFocusItem, me));
el.focusout(_.bind(me.onBlurItem, me)); el.focusout(_.bind(me.onBlurItem, me));
el.hover( el.hover(

2
apps/common/main/lib/component/TreeView.js
View file

@ -170,7 +170,7 @@ define([
options.store = options.store || new Common.UI.TreeViewStore(); options.store = options.store || new Common.UI.TreeViewStore();
options.emptyItemText = options.emptyItemText || ''; options.emptyItemText = options.emptyItemText || '';
options.itemTemplate = options.itemTemplate || _.template([ options.itemTemplate = options.itemTemplate || _.template([
'<div id="<%= id %>" class="tree-item <% if (!isVisible) { %>' + 'hidden' + '<% } %>" style="display: block;padding-left: <%= level*16 + 24 %>px;">', '<div id="<%= id %>" class="tree-item <% if (!isVisible) { %>' + 'd-none' + '<% } %>" style="display: block;padding-left: <%= level*16 + 24 %>px;">',
'<% if (hasSubItems) { %>', '<% if (hasSubItems) { %>',
'<div class="tree-caret img-commonctrl ' + '<% if (!isExpanded) { %>' + 'up' + '<% } %>' + '" style="margin-left: <%= level*16 %>px;"></div>', '<div class="tree-caret img-commonctrl ' + '<% if (!isExpanded) { %>' + 'up' + '<% } %>' + '" style="margin-left: <%= level*16 %>px;"></div>',
'<% } %>', '<% } %>',

4
apps/common/main/lib/component/Window.js
View file

@ -670,9 +670,9 @@ define([
var self = this; var self = this;
if (!me.$window.hasClass('notransform')) { if (!me.$window.hasClass('notransform')) {
me.$window.addClass('notransform'); me.$window.addClass('notransform');
menuRoot.addClass('hidden'); menuRoot.addClass('d-none');
setTimeout(function() { setTimeout(function() {
menuRoot.removeClass('hidden'); menuRoot.removeClass('d-none');
menuRoot.css({left: left, top: top}); menuRoot.css({left: left, top: top});
self.options.additionalAlign = null; self.options.additionalAlign = null;
}, 300); }, 300);

10
apps/common/main/lib/util/Tip.js
View file

@ -216,10 +216,12 @@ define([
} }
}, },
onCreate: function onCreate() { onCreate: function onCreate() {
var x = tp.left; if (tp) {
var y = tp.top; var x = tp.left;
virtualElement.getBoundingClientRect = generateGetBoundingClientRect(x, y); var y = tp.top;
me.update(); virtualElement.getBoundingClientRect = generateGetBoundingClientRect(x, y);
me.update();
}
} }
}); });
} }

26
apps/common/main/lib/view/About.js
View file

@ -95,7 +95,7 @@ define([
'</td>', '</td>',
'</tr>', '</tr>',
'</table>', '</table>',
'<table id="id-about-licensee-info" cols="1" style="width: 100%; margin-top: 20px;" class="hidden margin-bottom"><tbody>', '<table id="id-about-licensee-info" cols="1" style="width: 100%; margin-top: 20px;" class="d-none margin-bottom"><tbody>',
'<tr>', '<tr>',
'<td align="center" class="padding-small"><div id="id-about-company-logo"></div></td>', '<td align="center" class="padding-small"><div id="id-about-company-logo"></div></td>',
'</tr>', '</tr>',
@ -133,7 +133,7 @@ define([
'</td>', '</td>',
'</tr>', '</tr>',
'</table>', '</table>',
'<table id="id-about-licensor-short" cols="1" style="width: 100%; margin-top: 31px;" class="hidden"><tbody>', '<table id="id-about-licensor-short" cols="1" style="width: 100%; margin-top: 31px;" class="d-none"><tbody>',
'<tr>', '<tr>',
'<td style="width:50%;"><div class="separator horizontal short left"></div></td>', '<td style="width:50%;"><div class="separator horizontal short left"></div></td>',
'<td align="center"><label class="asc-about-header">' + this.txtPoweredBy + '</label></td>', '<td align="center"><label class="asc-about-header">' + this.txtPoweredBy + '</label></td>',
@ -198,42 +198,42 @@ define([
if (data && typeof data == 'object' && typeof(data.customer)=='object') { if (data && typeof data == 'object' && typeof(data.customer)=='object') {
var customer = data.customer; var customer = data.customer;
$('#id-about-licensor-logo').addClass('hidden'); $('#id-about-licensor-logo').addClass('d-none');
$('#id-about-licensor-short').removeClass('hidden'); $('#id-about-licensor-short').removeClass('d-none');
this.cntLicensorInfo.addClass('hidden'); this.cntLicensorInfo.addClass('d-none');
this.cntLicenseeInfo.removeClass('hidden'); this.cntLicenseeInfo.removeClass('d-none');
this.cntLicensorInfo.removeClass('margin-bottom'); this.cntLicensorInfo.removeClass('margin-bottom');
var value = customer.name; var value = customer.name;
value && value.length ? value && value.length ?
this.lblCompanyName.text(value) : this.lblCompanyName.text(value) :
this.lblCompanyName.parents('tr').addClass('hidden'); this.lblCompanyName.parents('tr').addClass('d-none');
value = customer.address; value = customer.address;
value && value.length ? value && value.length ?
this.lblCompanyAddress.text(value) : this.lblCompanyAddress.text(value) :
this.lblCompanyAddress.parents('tr').addClass('hidden'); this.lblCompanyAddress.parents('tr').addClass('d-none');
(value = customer.mail) && value.length ? (value = customer.mail) && value.length ?
this.lblCompanyMail.attr('href', "mailto:"+value).text(value) : this.lblCompanyMail.attr('href', "mailto:"+value).text(value) :
this.lblCompanyMail.parents('tr').addClass('hidden'); this.lblCompanyMail.parents('tr').addClass('d-none');
if ((value = customer.www) && value.length) { if ((value = customer.www) && value.length) {
var http = !/^https?:\/{2}/i.test(value) ? "http:\/\/" : ''; var http = !/^https?:\/{2}/i.test(value) ? "http:\/\/" : '';
this.lblCompanyUrl.attr('href', http+value).text(value); this.lblCompanyUrl.attr('href', http+value).text(value);
} else } else
this.lblCompanyUrl.parents('tr').addClass('hidden'); this.lblCompanyUrl.parents('tr').addClass('d-none');
(value = customer.info) && value.length ? (value = customer.info) && value.length ?
this.lblCompanyLic.text(value) : this.lblCompanyLic.text(value) :
this.lblCompanyLic.parents('tr').addClass('hidden'); this.lblCompanyLic.parents('tr').addClass('d-none');
(value = customer.logo) && value.length ? (value = customer.logo) && value.length ?
this.divCompanyLogo.html('<img src="'+value+'" style="max-width:216px; max-height: 35px;" />') : this.divCompanyLogo.html('<img src="'+value+'" style="max-width:216px; max-height: 35px;" />') :
this.divCompanyLogo.parents('tr').addClass('hidden'); this.divCompanyLogo.parents('tr').addClass('d-none');
} else { } else {
this.cntLicenseeInfo.addClass('hidden'); this.cntLicenseeInfo.addClass('d-none');
this.cntLicensorInfo.addClass('margin-bottom'); this.cntLicensorInfo.addClass('margin-bottom');
} }
} }

2
apps/common/main/lib/view/History.js
View file

@ -79,7 +79,7 @@ define([
store: this.storeHistory, store: this.storeHistory,
enableKeyEvents: false, enableKeyEvents: false,
itemTemplate: _.template([ itemTemplate: _.template([
'<div id="<%= id %>" class="history-item-wrap ' + '<% if (!isVisible) { %>' + 'hidden' + '<% } %>' + '" ', '<div id="<%= id %>" class="history-item-wrap ' + '<% if (!isVisible) { %>' + 'd-none' + '<% } %>' + '" ',
'style="display: block; ' + '<% if (!isRevision) { %>' + 'padding-left: 40px;' + '<% } %>' + '<% if (canRestore && selected) { %>' + 'padding-bottom: 6px;' + '<% } %>' +'">', 'style="display: block; ' + '<% if (!isRevision) { %>' + 'padding-left: 40px;' + '<% } %>' + '<% if (canRestore && selected) { %>' + 'padding-bottom: 6px;' + '<% } %>' +'">',
'<div class="user-date"><%= created %></div>', '<div class="user-date"><%= created %></div>',
'<% if (markedAsVersion) { %>', '<% if (markedAsVersion) { %>',

8
apps/common/main/lib/view/Plugins.js
View file

@ -59,7 +59,7 @@ define([
'<div id="plugins-list" class="">', '<div id="plugins-list" class="">',
'</div>', '</div>',
'</div>', '</div>',
'<div id="current-plugin-box" class="layout-ct vbox hidden">', '<div id="current-plugin-box" class="layout-ct vbox d-none">',
'<div id="current-plugin-header">', '<div id="current-plugin-header">',
'<label></label>', '<label></label>',
'<div id="id-plugin-close" class="plugin-close img-commonctrl"></div>', '<div id="id-plugin-close" class="plugin-close img-commonctrl"></div>',
@ -197,8 +197,8 @@ define([
openInsideMode: function(name, url, frameId) { openInsideMode: function(name, url, frameId) {
if (!this.pluginsPanel) return false; if (!this.pluginsPanel) return false;
this.pluginsPanel.toggleClass('hidden', true); this.pluginsPanel.toggleClass('d-none', true);
this.currentPluginPanel.toggleClass('hidden', false); this.currentPluginPanel.toggleClass('d-none', false);
this.pluginName.text(name); this.pluginName.text(name);
if (!this.iframePlugin) { if (!this.iframePlugin) {
@ -232,7 +232,7 @@ define([
this.currentPluginFrame.empty(); this.currentPluginFrame.empty();
this.iframePlugin = null; this.iframePlugin = null;
} }
this.currentPluginPanel.toggleClass('hidden', true); this.currentPluginPanel.toggleClass('d-none', true);
// this.pluginsPanel.toggleClass('hidden', false); // this.pluginsPanel.toggleClass('hidden', false);
this.fireEvent('plugin:open', [this, 'onboard', 'close']); this.fireEvent('plugin:open', [this, 'onboard', 'close']);

2
apps/common/main/lib/view/SignDialog.js
View file

@ -234,7 +234,7 @@ define([
me.cntVisibleSign = $('#id-dlg-sign-visible'); me.cntVisibleSign = $('#id-dlg-sign-visible');
me.cntInvisibleSign = $('#id-dlg-sign-invisible'); me.cntInvisibleSign = $('#id-dlg-sign-invisible');
(me.signType == 'visible') ? me.cntInvisibleSign.addClass('hidden') : me.cntVisibleSign.addClass('hidden'); (me.signType == 'visible') ? me.cntInvisibleSign.addClass('d-none') : me.cntVisibleSign.addClass('d-none');
$window.find('.dlg-btn').on('click', _.bind(me.onBtnClick, me)); $window.find('.dlg-btn').on('click', _.bind(me.onBtnClick, me));

8
apps/common/main/lib/view/SymbolTableDialog.js
View file

@ -410,7 +410,7 @@ define([
this.template = [ this.template = [
'<div class="box">', '<div class="box">',
'<div style="margin-bottom: 16px;" class="'+ (this.special ? '' : 'hidden') +'">', '<div style="margin-bottom: 16px;" class="'+ (this.special ? '' : 'd-none') +'">',
'<button type="button" class="btn btn-text-default auto" id="symbol-table-symbols" style="border-top-right-radius: 0;border-bottom-right-radius: 0;">', this.textSymbols,'</button>', '<button type="button" class="btn btn-text-default auto" id="symbol-table-symbols" style="border-top-right-radius: 0;border-bottom-right-radius: 0;">', this.textSymbols,'</button>',
'<button type="button" class="btn btn-text-default auto" id="symbol-table-special" style="border-top-left-radius: 0;border-bottom-left-radius: 0;border-left-width: 0;margin-left: -1px;">', this.textSpecial,'</button>', '<button type="button" class="btn btn-text-default auto" id="symbol-table-special" style="border-top-left-radius: 0;border-bottom-left-radius: 0;border-left-width: 0;margin-left: -1px;">', this.textSpecial,'</button>',
'</div>', '</div>',
@ -758,7 +758,7 @@ define([
this.specialList.selectByIndex(0); this.specialList.selectByIndex(0);
this.lblShortCut = $window.find('#symbol-table-lbl-shortcut'); this.lblShortCut = $window.find('#symbol-table-lbl-shortcut');
this.lblShortCut.toggleClass('hidden', !this.showShortcutKey); this.lblShortCut.toggleClass('d-none', !this.showShortcutKey);
$window.find('.dlg-btn').on('click', _.bind(this.onBtnClick, this)); $window.find('.dlg-btn').on('click', _.bind(this.onBtnClick, this));
this.symbolsPanel = $window.find('#symbol-table-pnl-symbols'); this.symbolsPanel = $window.find('#symbol-table-pnl-symbols');
@ -1468,8 +1468,8 @@ define([
}, },
ShowHideElem: function(special) { ShowHideElem: function(special) {
this.symbolsPanel.toggleClass('hidden', special); this.symbolsPanel.toggleClass('d-none', special);
this.specialPanel.toggleClass('hidden', !special); this.specialPanel.toggleClass('d-none', !special);
var me = this; var me = this;
_.delay(function(){ _.delay(function(){
special ? me.specialList.cmpEl.find('.listview').focus() : me.previewPanel.focus(); special ? me.specialList.cmpEl.find('.listview').focus() : me.previewPanel.focus();

4
apps/common/main/resources/less/common.less
View file

@ -36,4 +36,8 @@ label {
.user-select { .user-select {
.user-select(text); .user-select(text);
}
.dropdown-divider {
margin: 6.5px 0;
} }

18
apps/common/main/resources/less/dropdown-submenu.less
View file

@ -2,10 +2,6 @@
position:relative; position:relative;
& > .dropdown-menu { & > .dropdown-menu {
top: 0;
left: 100%;
margin-top: -6px;
margin-left: -1px;
border-radius:@border-radius-base; border-radius:@border-radius-base;
&.pull-right { &.pull-right {
@ -35,4 +31,18 @@
&.over > a:after { &.over > a:after {
border-left-color: @dropdown-link-color; border-left-color: @dropdown-link-color;
} }
&.dropright {
& > .dropdown-menu {
margin-top: -6px;
margin-left: -1px;
}
}
&.dropleft {
& > .dropdown-menu {
margin-top: -6px;
margin-right: -1px;
}
}
} }

2
apps/documenteditor/embed/js/ApplicationController.js
View file

@ -239,7 +239,7 @@ DE.ApplicationController = new(function(){
$('#idt-fullscreen').hide(); $('#idt-fullscreen').hide();
if ( !embedConfig.saveUrl && permissions.print === false && !embedConfig.shareUrl && !embedConfig.embedUrl && !embedConfig.fullscreenUrl) if ( !embedConfig.saveUrl && permissions.print === false && !embedConfig.shareUrl && !embedConfig.embedUrl && !embedConfig.fullscreenUrl)
$('#box-tools').addClass('hidden'); $('#box-tools').addClass('d-none');
common.controller.modals.attach({ common.controller.modals.attach({
share: '#idt-share', share: '#idt-share',

9
apps/documenteditor/main/app/controller/Toolbar.js
View file

@ -2491,7 +2491,7 @@ define([
menu: new Common.UI.Menu({ menu: new Common.UI.Menu({
menuAlign: 'tl-tr', menuAlign: 'tl-tr',
items: [ items: [
{ template: _.template('<div id="id-toolbar-menu-shapegroup' + i + '" class="menu-shape" style="width: ' + (shapeGroup.get('groupWidth') - 8) + 'px; margin-left: 5px;"></div>') } { template: _.template('<div id="id-toolbar-menu-shapegroup' + i + '" class="menu-shape" style="width: ' + (shapeGroup.get('groupWidth') - 8) + 'px; margin-left: 5px;"></div>'), clsDropdownItem: false }
] ]
}) })
}); });
@ -2547,9 +2547,12 @@ define([
menu: new Common.UI.Menu({ menu: new Common.UI.Menu({
menuAlign: 'tl-tr', menuAlign: 'tl-tr',
items: [ items: [
{ template: _.template('<div id="id-toolbar-menu-equationgroup' + i + {
template: _.template('<div id="id-toolbar-menu-equationgroup' + i +
'" class="menu-shape" style="width:' + (equationGroup.get('groupWidth') + 8) + 'px; ' + '" class="menu-shape" style="width:' + (equationGroup.get('groupWidth') + 8) + 'px; ' +
equationGroup.get('groupHeight') + 'margin-left:5px;"></div>') } equationGroup.get('groupHeight') + 'margin-left:5px;"></div>'),
clsDropdownItem: false
}
] ]
}) })
}); });

14
apps/documenteditor/main/app/view/FileMenuPanels.js
View file

@ -368,7 +368,7 @@ define([
var itemsTemplate = var itemsTemplate =
_.template([ _.template([
'<% _.each(items, function(item) { %>', '<% _.each(items, function(item) { %>',
'<li id="<%= item.id %>" data-value="<%= item.value %>" <% if (item.value === "custom") { %> style="border-top: 1px solid #e5e5e5;margin-top: 5px;" <% } %> ><a tabindex="-1" type="menuitem" <% if (typeof(item.checked) !== "undefined" && item.checked) { %> class="checked" <% } %> ><%= scope.getDisplayValue(item) %></a></li>', '<li id="<%= item.id %>" class="dropdown-item" data-value="<%= item.value %>" <% if (item.value === "custom") { %> style="border-top: 1px solid #e5e5e5;margin-top: 5px;" <% } %> ><a tabindex="-1" type="menuitem" <% if (typeof(item.checked) !== "undefined" && item.checked) { %> class="checked" <% } %> ><%= scope.getDisplayValue(item) %></a></li>',
'<% }); %>' '<% }); %>'
].join('')); ].join(''));
this.cmbFontRender = new Common.UI.ComboBox({ this.cmbFontRender = new Common.UI.ComboBox({
@ -1087,7 +1087,7 @@ define([
me.trAuthor.before(div); me.trAuthor.before(div);
me.authors.push(item); me.authors.push(item);
}); });
this.tblAuthor.find('.close').toggleClass('hidden', !this.mode.isEdit); this.tblAuthor.find('.close').toggleClass('d-none', !this.mode.isEdit);
!this.mode.isEdit && this._ShowHideInfoItem(this.tblAuthor, !!this.authors.length); !this.mode.isEdit && this._ShowHideInfoItem(this.tblAuthor, !!this.authors.length);
} }
this.SetDisabled(); this.SetDisabled();
@ -1569,13 +1569,13 @@ define([
var me = this; var me = this;
this.templateSignature = _.template([ this.templateSignature = _.template([
'<table cols="2" width="300" class="<% if (!hasRequested && !hasSigned) { %>hidden<% } %>"">', '<table cols="2" width="300" class="<% if (!hasRequested && !hasSigned) { %>d-none<% } %>"">',
'<tr>', '<tr>',
'<td colspan="2"><label style="cursor: default;"><%= tipText %></label></td>', '<td colspan="2"><label style="cursor: default;"><%= tipText %></label></td>',
'</tr>', '</tr>',
'<tr>', '<tr>',
'<td><label class="link signature-view-link">' + me.txtView + '</label></td>', '<td><label class="link signature-view-link">' + me.txtView + '</label></td>',
'<td align="right"><label class="link signature-edit-link <% if (!hasSigned) { %>hidden<% } %>">' + me.txtEdit + '</label></td>', '<td align="right"><label class="link signature-edit-link <% if (!hasSigned) { %>d-none<% } %>">' + me.txtEdit + '</label></td>',
'</tr>', '</tr>',
'</table>' '</table>'
].join('')); ].join(''));
@ -1628,8 +1628,8 @@ define([
setMode: function(mode) { setMode: function(mode) {
this.mode = mode; this.mode = mode;
this.cntSignature.toggleClass('hidden', !this.mode.isSignatureSupport); this.cntSignature.toggleClass('d-none', !this.mode.isSignatureSupport);
this.cntPassword.toggleClass('hidden', !this.mode.isPasswordSupport); this.cntPassword.toggleClass('d-none', !this.mode.isPasswordSupport);
}, },
setApi: function(o) { setApi: function(o) {
@ -1690,7 +1690,7 @@ define([
}, },
updateEncrypt: function() { updateEncrypt: function() {
this.cntPasswordView.toggleClass('hidden', this.btnAddPwd.isVisible()); this.cntPasswordView.toggleClass('d-none', this.btnAddPwd.isVisible());
}, },
strProtect: 'Protect Document', strProtect: 'Protect Document',

4
apps/documenteditor/main/app/view/HyperlinkSettingsDialog.js
View file

@ -184,8 +184,8 @@ define([
}, },
ShowHideElem: function(value) { ShowHideElem: function(value) {
this.externalPanel.toggleClass('hidden', value !== c_oHyperlinkType.WebLink); this.externalPanel.toggleClass('d-none', value !== c_oHyperlinkType.WebLink);
this.internalPanel.toggleClass('hidden', value !== c_oHyperlinkType.InternalLink); this.internalPanel.toggleClass('d-none', value !== c_oHyperlinkType.InternalLink);
var store = this.internalList.store; var store = this.internalList.store;
if (value==c_oHyperlinkType.InternalLink) { if (value==c_oHyperlinkType.InternalLink) {
if (store.length<1) { if (store.length<1) {

2
apps/documenteditor/main/app/view/LeftMenu.js
View file

@ -389,7 +389,7 @@ define([
this.devHeight = this.developerHint.outerHeight(); this.devHeight = this.developerHint.outerHeight();
$(window).on('resize', _.bind(this.onWindowResize, this)); $(window).on('resize', _.bind(this.onWindowResize, this));
} }
this.developerHint.toggleClass('hidden', !mode); this.developerHint.toggleClass('d-none', !mode);
var btns = this.$el.find('button.btn-category:visible'), var btns = this.$el.find('button.btn-category:visible'),
lastbtn = (btns.length>0) ? $(btns[btns.length-1]) : null; lastbtn = (btns.length>0) ? $(btns[btns.length-1]) : null;

7
apps/documenteditor/main/app/view/Links.js
View file

@ -180,8 +180,8 @@ define([
var _menu = new Common.UI.Menu({ var _menu = new Common.UI.Menu({
cls: 'toc-menu', cls: 'toc-menu',
items: [ items: [
{template: contentsTemplate, offsety: 0, value: 0}, {template: contentsTemplate, offsety: 0, value: 0, clsDropdownItem: false},
{template: contentsTemplate, offsety: 72, value: 1}, {template: contentsTemplate, offsety: 72, value: 1, clsDropdownItem: false},
{caption: me.textContentsSettings, value: 'settings'}, {caption: me.textContentsSettings, value: 'settings'},
{caption: me.textContentsRemove, value: 'remove'} {caption: me.textContentsRemove, value: 'remove'}
] ]
@ -233,7 +233,8 @@ define([
'<button id="id-menu-goto-footnote-prev-' + index + '" type="button" style="float:right; margin-top: 2px;" class="btn small btn-toolbar"><i class="icon menu__icon btn-previtem">&nbsp;</i></button>', '<button id="id-menu-goto-footnote-prev-' + index + '" type="button" style="float:right; margin-top: 2px;" class="btn small btn-toolbar"><i class="icon menu__icon btn-previtem">&nbsp;</i></button>',
'</div>' '</div>'
].join('')), ].join('')),
stopPropagation: true stopPropagation: true,
clsDropdownItem: false
}), }),
{caption: '--'}, {caption: '--'},
{caption: me.mniDelFootnote, value: 'delele'}, {caption: me.mniDelFootnote, value: 'delele'},

2
apps/documenteditor/main/app/view/ListSettingsDialog.js
View file

@ -125,7 +125,7 @@ define([
'<% } %>', '<% } %>',
'<table cols="2" style="width: 100%;">', '<table cols="2" style="width: 100%;">',
'<tr>', '<tr>',
'<td class="<% if (type != 2) { %> hidden <% } %>" style="width: 50px; padding-right: 10px;">', '<td class="<% if (type != 2) { %> d-none <% } %>" style="width: 50px; padding-right: 10px;">',
'<label>' + this.textLevel + '</label>', '<label>' + this.textLevel + '</label>',
'<div id="levels-list" class="no-borders" style="width:100%; height:208px;margin-top: 2px; "></div>', '<div id="levels-list" class="no-borders" style="width:100%; height:208px;margin-top: 2px; "></div>',
'</td>', '</td>',

2
apps/documenteditor/main/app/view/ParagraphSettings.js
View file

@ -470,7 +470,7 @@ define([
hideTextOnlySettings: function(value) { hideTextOnlySettings: function(value) {
if (this._state.HideTextOnlySettings !== value) { if (this._state.HideTextOnlySettings !== value) {
this._state.HideTextOnlySettings = value; this._state.HideTextOnlySettings = value;
this.TextOnlySettings.toggleClass('hidden', value==true); this.TextOnlySettings.toggleClass('d-none', value==true);
} }
}, },

2
apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js
View file

@ -1319,7 +1319,7 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
}, },
hideTextOnlySettings: function(value) { hideTextOnlySettings: function(value) {
this.TextOnlySettings.toggleClass('hidden', value==true); this.TextOnlySettings.toggleClass('d-none', value==true);
this.btnsCategory[1].setVisible(!value); // Line & Page Breaks this.btnsCategory[1].setVisible(!value); // Line & Page Breaks
this.btnsCategory[2].setVisible(!value); // Borders this.btnsCategory[2].setVisible(!value); // Borders
this.btnsCategory[5].setVisible(!value); // Paddings this.btnsCategory[5].setVisible(!value); // Paddings

4
apps/documenteditor/main/app/view/ShapeSettings.js
View file

@ -1806,14 +1806,14 @@ define([
hideShapeOnlySettings: function(value) { hideShapeOnlySettings: function(value) {
if (this._state.HideShapeOnlySettings !== value) { if (this._state.HideShapeOnlySettings !== value) {
this._state.HideShapeOnlySettings = value; this._state.HideShapeOnlySettings = value;
this.ShapeOnlySettings.toggleClass('hidden', value==true); this.ShapeOnlySettings.toggleClass('d-none', value==true);
} }
}, },
hideChangeTypeSettings: function(value) { hideChangeTypeSettings: function(value) {
if (this._state.HideChangeTypeSettings !== value) { if (this._state.HideChangeTypeSettings !== value) {
this._state.HideChangeTypeSettings = value; this._state.HideChangeTypeSettings = value;
this.CanChangeType.toggleClass('hidden', value==true); this.CanChangeType.toggleClass('d-none', value==true);
} }
}, },

6
apps/documenteditor/main/app/view/SignatureSettings.js
View file

@ -196,9 +196,9 @@ define([
this.viewValidList.store.reset(validSignatures); this.viewValidList.store.reset(validSignatures);
this.viewInvalidList.store.reset(invalidSignatures); this.viewInvalidList.store.reset(invalidSignatures);
this.$el.find('.requested').toggleClass('hidden', !me._state.hasRequested); this.$el.find('.requested').toggleClass('d-none', !me._state.hasRequested);
this.$el.find('.valid').toggleClass('hidden', !me._state.hasValid); this.$el.find('.valid').toggleClass('d-none', !me._state.hasValid);
this.$el.find('.invalid').toggleClass('hidden', !me._state.hasInvalid); this.$el.find('.invalid').toggleClass('d-none', !me._state.hasInvalid);
me.disableEditing(me._state.hasValid || me._state.hasInvalid); me.disableEditing(me._state.hasValid || me._state.hasInvalid);
}, },

10
apps/documenteditor/main/app/view/TableOfContentsSettings.js
View file

@ -101,7 +101,7 @@ define([
'<label class="input-label">' + me.textLevels + '</label>', '<label class="input-label">' + me.textLevels + '</label>',
'<div id="tableofcontents-spin-levels" style="display: inline-block; width:95px; margin-left: 10px;"></div>', '<div id="tableofcontents-spin-levels" style="display: inline-block; width:95px; margin-left: 10px;"></div>',
'</div>', '</div>',
'<div id="tableofcontents-from-styles" class="hidden">', '<div id="tableofcontents-from-styles" class="d-none">',
'<table><tr><td style="height: 25px;">', '<table><tr><td style="height: 25px;">',
'<label class="input-label" style="width: 144px; margin-left: 23px;">' + me.textStyle + '</label>', '<label class="input-label" style="width: 144px; margin-left: 23px;">' + me.textStyle + '</label>',
'<label class="input-label" style="">' + me.textLevel + '</label>', '<label class="input-label" style="">' + me.textLevel + '</label>',
@ -224,8 +224,8 @@ define([
}); });
this.radioLevels.on('change', _.bind(function(field, newValue, eOpts) { this.radioLevels.on('change', _.bind(function(field, newValue, eOpts) {
if (newValue) { if (newValue) {
this.levelsContainer.toggleClass('hidden', !newValue); this.levelsContainer.toggleClass('d-none', !newValue);
this.stylesContainer.toggleClass('hidden', newValue); this.stylesContainer.toggleClass('d-none', newValue);
if (this._needUpdateOutlineLevels) if (this._needUpdateOutlineLevels)
this.synchronizeLevelsFromStyles(); this.synchronizeLevelsFromStyles();
} }
@ -238,8 +238,8 @@ define([
}); });
this.radioStyles.on('change', _.bind(function(field, newValue, eOpts) { this.radioStyles.on('change', _.bind(function(field, newValue, eOpts) {
if (newValue) { if (newValue) {
this.stylesContainer.toggleClass('hidden', !newValue); this.stylesContainer.toggleClass('d-none', !newValue);
this.levelsContainer.toggleClass('hidden', newValue); this.levelsContainer.toggleClass('d-none', newValue);
if (this._needUpdateStyles) if (this._needUpdateStyles)
this.synchronizeLevelsFromOutline(); this.synchronizeLevelsFromOutline();
this.stylesList.scroller.update({alwaysVisibleY: true}); this.stylesList.scroller.update({alwaysVisibleY: true});

3
apps/documenteditor/main/app/view/TableSettings.js
View file

@ -323,6 +323,7 @@ define([
cls: 'btn-icon-default', cls: 'btn-icon-default',
iconCls: 'btn-edit-table', iconCls: 'btn-edit-table',
menu : new Common.UI.Menu({ menu : new Common.UI.Menu({
cls: 'dropdown-menu-right',
menuAlign: 'tr-br', menuAlign: 'tr-br',
items: [ items: [
{ caption: this.selectRowText, value: 0 }, { caption: this.selectRowText, value: 0 },
@ -669,7 +670,7 @@ define([
menu : new Common.UI.Menu({ menu : new Common.UI.Menu({
style: 'width: 575px;', style: 'width: 575px;',
items: [ items: [
{ template: _.template('<div id="id-table-menu-template" class="menu-table-template" style="margin: 5px 5px 5px 10px;"></div>') } { template: _.template('<div id="id-table-menu-template" class="menu-table-template" style="margin: 5px 5px 5px 10px;"></div>'), clsDropdownItem: false }
] ]
}) })
}); });

2
apps/documenteditor/main/app/view/Toolbar.js
View file

@ -1672,7 +1672,7 @@ define([
menu: new Common.UI.Menu({ menu: new Common.UI.Menu({
menuAlign: 'tl-tr', menuAlign: 'tl-tr',
items: [ items: [
{template: _.template('<div id="id-toolbar-menu-pageposition" class="menu-pageposition"></div>')}, {template: _.template('<div id="id-toolbar-menu-pageposition" class="menu-pageposition"></div>'), clsDropdownItem: false},
this.mnuPageNumCurrentPos = new Common.UI.MenuItem({ this.mnuPageNumCurrentPos = new Common.UI.MenuItem({
caption: this.textToCurrent, caption: this.textToCurrent,
disabled: this.mnuPageNumCurrentPos.isDisabled(), disabled: this.mnuPageNumCurrentPos.isDisabled(),

2
apps/documenteditor/main/resources/less/rightmenu.less
View file

@ -15,7 +15,7 @@
display: none; display: none;
padding: 0 10px 0 15px; padding: 0 10px 0 15px;
position: relative; position: relative;
overflow: hidden; //overflow: hidden;
border-left: 1px solid @gray-dark; border-left: 1px solid @gray-dark;
line-height: 15px; line-height: 15px;
} }

2
apps/presentationeditor/embed/js/ApplicationController.js
View file

@ -243,7 +243,7 @@ PE.ApplicationController = new(function(){
$('#idt-fullscreen').hide(); $('#idt-fullscreen').hide();
if ( !embedConfig.saveUrl && permissions.print === false && !embedConfig.shareUrl && !embedConfig.embedUrl && !embedConfig.fullscreenUrl) if ( !embedConfig.saveUrl && permissions.print === false && !embedConfig.shareUrl && !embedConfig.embedUrl && !embedConfig.fullscreenUrl)
$('#box-tools').addClass('hidden'); $('#box-tools').addClass('d-none');
common.controller.modals.attach({ common.controller.modals.attach({
share: '#idt-share', share: '#idt-share',

14
apps/presentationeditor/main/app/view/FileMenuPanels.js
View file

@ -960,7 +960,7 @@ define([
me.trAuthor.before(div); me.trAuthor.before(div);
me.authors.push(item); me.authors.push(item);
}); });
this.tblAuthor.find('.close').toggleClass('hidden', !this.mode.isEdit); this.tblAuthor.find('.close').toggleClass('d-none', !this.mode.isEdit);
!this.mode.isEdit && this._ShowHideInfoItem(this.tblAuthor, !!this.authors.length); !this.mode.isEdit && this._ShowHideInfoItem(this.tblAuthor, !!this.authors.length);
} }
this.SetDisabled(); this.SetDisabled();
@ -981,7 +981,7 @@ define([
this.mode = mode; this.mode = mode;
this.inputAuthor.setVisible(mode.isEdit); this.inputAuthor.setVisible(mode.isEdit);
this.btnApply.setVisible(mode.isEdit); this.btnApply.setVisible(mode.isEdit);
this.tblAuthor.find('.close').toggleClass('hidden', !mode.isEdit); this.tblAuthor.find('.close').toggleClass('d-none', !mode.isEdit);
if (!mode.isEdit) { if (!mode.isEdit) {
this.inputTitle._input.attr('placeholder', ''); this.inputTitle._input.attr('placeholder', '');
this.inputSubject._input.attr('placeholder', ''); this.inputSubject._input.attr('placeholder', '');
@ -1344,13 +1344,13 @@ define([
var me = this; var me = this;
this.templateSignature = _.template([ this.templateSignature = _.template([
'<table cols="2" width="300" class="<% if (!hasSigned) { %>hidden<% } %>"">', '<table cols="2" width="300" class="<% if (!hasSigned) { %>d-none<% } %>"">',
'<tr>', '<tr>',
'<td colspan="2"><label style="cursor: default;"><%= tipText %></label></td>', '<td colspan="2"><label style="cursor: default;"><%= tipText %></label></td>',
'</tr>', '</tr>',
'<tr>', '<tr>',
'<td><label class="link signature-view-link">' + me.txtView + '</label></td>', '<td><label class="link signature-view-link">' + me.txtView + '</label></td>',
'<td align="right"><label class="link signature-edit-link <% if (!hasSigned) { %>hidden<% } %>">' + me.txtEdit + '</label></td>', '<td align="right"><label class="link signature-edit-link <% if (!hasSigned) { %>d-none<% } %>">' + me.txtEdit + '</label></td>',
'</tr>', '</tr>',
'</table>' '</table>'
].join('')); ].join(''));
@ -1403,8 +1403,8 @@ define([
setMode: function(mode) { setMode: function(mode) {
this.mode = mode; this.mode = mode;
this.cntSignature.toggleClass('hidden', !this.mode.isSignatureSupport); this.cntSignature.toggleClass('d-none', !this.mode.isSignatureSupport);
this.cntPassword.toggleClass('hidden', !this.mode.isPasswordSupport); this.cntPassword.toggleClass('d-none', !this.mode.isPasswordSupport);
}, },
setApi: function(o) { setApi: function(o) {
@ -1459,7 +1459,7 @@ define([
}, },
updateEncrypt: function() { updateEncrypt: function() {
this.cntPasswordView.toggleClass('hidden', this.btnAddPwd.isVisible()); this.cntPasswordView.toggleClass('d-none', this.btnAddPwd.isVisible());
}, },
strProtect: 'Protect Presentation', strProtect: 'Protect Presentation',

6
apps/presentationeditor/main/app/view/HyperlinkSettingsDialog.js
View file

@ -80,7 +80,7 @@ define([
'</div>', '</div>',
'<div id="id-dlg-hyperlink-url" class="input-row" style="margin-bottom: 5px;"></div>', '<div id="id-dlg-hyperlink-url" class="input-row" style="margin-bottom: 5px;"></div>',
'</div>', '</div>',
'<div id="id-internal-link" class="hidden">', '<div id="id-internal-link" class="d-none">',
'<div class="input-row">', '<div class="input-row">',
'<label>' + this.strLinkTo + '</label>', '<label>' + this.strLinkTo + '</label>',
'</div>', '</div>',
@ -285,8 +285,8 @@ define([
}, },
ShowHideElem: function(value, url) { ShowHideElem: function(value, url) {
this.externalPanel.toggleClass('hidden', value !== c_oHyperlinkType.WebLink); this.externalPanel.toggleClass('d-none', value !== c_oHyperlinkType.WebLink);
this.internalPanel.toggleClass('hidden', value !== c_oHyperlinkType.InternalLink); this.internalPanel.toggleClass('d-none', value !== c_oHyperlinkType.InternalLink);
if (value==c_oHyperlinkType.InternalLink) { if (value==c_oHyperlinkType.InternalLink) {
if (url===null || url===undefined || url=='' ) if (url===null || url===undefined || url=='' )
url = "ppaction://hlinkshowjump?jump=firstslide"; url = "ppaction://hlinkshowjump?jump=firstslide";

2
apps/presentationeditor/main/app/view/LeftMenu.js
View file

@ -367,7 +367,7 @@ define([
this.devHeight = this.developerHint.outerHeight(); this.devHeight = this.developerHint.outerHeight();
$(window).on('resize', _.bind(this.onWindowResize, this)); $(window).on('resize', _.bind(this.onWindowResize, this));
} }
this.developerHint.toggleClass('hidden', !mode); this.developerHint.toggleClass('d-none', !mode);
var btns = this.$el.find('button.btn-category:visible'), var btns = this.$el.find('button.btn-category:visible'),
lastbtn = (btns.length>0) ? $(btns[btns.length-1]) : null; lastbtn = (btns.length>0) ? $(btns[btns.length-1]) : null;

4
apps/presentationeditor/main/app/view/ShapeSettings.js
View file

@ -1678,14 +1678,14 @@ define([
hideShapeOnlySettings: function(value) { hideShapeOnlySettings: function(value) {
if (this._state.HideShapeOnlySettings !== value) { if (this._state.HideShapeOnlySettings !== value) {
this._state.HideShapeOnlySettings = value; this._state.HideShapeOnlySettings = value;
this.ShapeOnlySettings.toggleClass('hidden', value==true); this.ShapeOnlySettings.toggleClass('d-none', value==true);
} }
}, },
hideChangeTypeSettings: function(value) { hideChangeTypeSettings: function(value) {
if (this._state.HideChangeTypeSettings !== value) { if (this._state.HideChangeTypeSettings !== value) {
this._state.HideChangeTypeSettings = value; this._state.HideChangeTypeSettings = value;
this.CanChangeType.toggleClass('hidden', value==true); this.CanChangeType.toggleClass('d-none', value==true);
} }
}, },

4
apps/presentationeditor/main/app/view/SignatureSettings.js
View file

@ -171,8 +171,8 @@ define([
this.viewValidList.store.reset(validSignatures); this.viewValidList.store.reset(validSignatures);
this.viewInvalidList.store.reset(invalidSignatures); this.viewInvalidList.store.reset(invalidSignatures);
this.$el.find('.valid').toggleClass('hidden', !me._state.hasValid); this.$el.find('.valid').toggleClass('d-none', !me._state.hasValid);
this.$el.find('.invalid').toggleClass('hidden', !me._state.hasInvalid); this.$el.find('.invalid').toggleClass('d-none', !me._state.hasInvalid);
me.disableEditing(me._state.hasValid || me._state.hasInvalid); me.disableEditing(me._state.hasValid || me._state.hasInvalid);
}, },

2
apps/spreadsheeteditor/embed/js/ApplicationController.js
View file

@ -188,7 +188,7 @@ SSE.ApplicationController = new(function(){
$('#idt-fullscreen').hide(); $('#idt-fullscreen').hide();
if ( !embedConfig.saveUrl && permissions.print === false && !embedConfig.shareUrl && !embedConfig.embedUrl && !embedConfig.fullscreenUrl) if ( !embedConfig.saveUrl && permissions.print === false && !embedConfig.shareUrl && !embedConfig.embedUrl && !embedConfig.fullscreenUrl)
$('#box-tools').addClass('hidden'); $('#box-tools').addClass('d-none');
common.controller.modals.attach({ common.controller.modals.attach({
share: '#idt-share', share: '#idt-share',

6
apps/spreadsheeteditor/main/app/controller/Spellcheck.js
View file

@ -277,13 +277,13 @@ define([
this.panelSpellcheck.btnChange.setDisabled(arr.length<1 || disabled); this.panelSpellcheck.btnChange.setDisabled(arr.length<1 || disabled);
this.panelSpellcheck.btnIgnore.setDisabled(!word || disabled); this.panelSpellcheck.btnIgnore.setDisabled(!word || disabled);
this.panelSpellcheck.btnToDictionary.setDisabled(!word || disabled); this.panelSpellcheck.btnToDictionary.setDisabled(!word || disabled);
this.panelSpellcheck.lblComplete.toggleClass('hidden', !property || !!word); this.panelSpellcheck.lblComplete.toggleClass('d-none', !property || !!word);
this.panelSpellcheck.buttonNext.setDisabled(!this.panelSpellcheck.lblComplete.hasClass('hidden')); this.panelSpellcheck.buttonNext.setDisabled(!this.panelSpellcheck.lblComplete.hasClass('d-none'));
}, },
onApiEditCell: function(state) { onApiEditCell: function(state) {
if (state == Asc.c_oAscCellEditorState.editEnd) { if (state == Asc.c_oAscCellEditorState.editEnd) {
this.panelSpellcheck.buttonNext.setDisabled(!this.panelSpellcheck.lblComplete.hasClass('hidden')); this.panelSpellcheck.buttonNext.setDisabled(!this.panelSpellcheck.lblComplete.hasClass('d-none'));
this.panelSpellcheck.cmbDictionaryLanguage.setDisabled((this.languages && this.languages.length > 0) ? false : true); this.panelSpellcheck.cmbDictionaryLanguage.setDisabled((this.languages && this.languages.length > 0) ? false : true);
} else { } else {
this.panelSpellcheck.buttonNext.setDisabled(true); this.panelSpellcheck.buttonNext.setDisabled(true);

2
apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js
View file

@ -1030,7 +1030,7 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template'
type == Asc.c_oAscChartTypeSettings.lineStackedPer || type == Asc.c_oAscChartTypeSettings.scatter); type == Asc.c_oAscChartTypeSettings.lineStackedPer || type == Asc.c_oAscChartTypeSettings.scatter);
this.chMarkers.setVisible(value); this.chMarkers.setVisible(value);
this.cmbLines.setVisible(value); this.cmbLines.setVisible(value);
this.lblLines.toggleClass('hidden', !value); this.lblLines.toggleClass('d-none', !value);
if (value) { if (value) {
this.chMarkers.setValue(this.chartSettings.getShowMarker(), true); this.chMarkers.setValue(this.chartSettings.getShowMarker(), true);

14
apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
View file

@ -1769,7 +1769,7 @@ define([
me.trAuthor.before(div); me.trAuthor.before(div);
me.authors.push(item); me.authors.push(item);
}); });
this.tblAuthor.find('.close').toggleClass('hidden', !this.mode.isEdit); this.tblAuthor.find('.close').toggleClass('d-none', !this.mode.isEdit);
!this.mode.isEdit && this._ShowHideInfoItem(this.tblAuthor, !!this.authors.length); !this.mode.isEdit && this._ShowHideInfoItem(this.tblAuthor, !!this.authors.length);
} }
this.SetDisabled(); this.SetDisabled();
@ -1790,7 +1790,7 @@ define([
this.mode = mode; this.mode = mode;
this.inputAuthor.setVisible(mode.isEdit); this.inputAuthor.setVisible(mode.isEdit);
this.btnApply.setVisible(mode.isEdit); this.btnApply.setVisible(mode.isEdit);
this.tblAuthor.find('.close').toggleClass('hidden', !mode.isEdit); this.tblAuthor.find('.close').toggleClass('d-none', !mode.isEdit);
if (!mode.isEdit) { if (!mode.isEdit) {
this.inputTitle._input.attr('placeholder', ''); this.inputTitle._input.attr('placeholder', '');
this.inputSubject._input.attr('placeholder', ''); this.inputSubject._input.attr('placeholder', '');
@ -2152,13 +2152,13 @@ define([
var me = this; var me = this;
this.templateSignature = _.template([ this.templateSignature = _.template([
'<table cols="2" width="300" class="<% if (!hasRequested && !hasSigned) { %>hidden<% } %>"">', '<table cols="2" width="300" class="<% if (!hasRequested && !hasSigned) { %>d-none<% } %>"">',
'<tr>', '<tr>',
'<td colspan="2"><label style="cursor: default;"><%= tipText %></label></td>', '<td colspan="2"><label style="cursor: default;"><%= tipText %></label></td>',
'</tr>', '</tr>',
'<tr>', '<tr>',
'<td><label class="link signature-view-link">' + me.txtView + '</label></td>', '<td><label class="link signature-view-link">' + me.txtView + '</label></td>',
'<td align="right"><label class="link signature-edit-link <% if (!hasSigned) { %>hidden<% } %>">' + me.txtEdit + '</label></td>', '<td align="right"><label class="link signature-edit-link <% if (!hasSigned) { %>d-none<% } %>">' + me.txtEdit + '</label></td>',
'</tr>', '</tr>',
'</table>' '</table>'
].join('')); ].join(''));
@ -2211,8 +2211,8 @@ define([
setMode: function(mode) { setMode: function(mode) {
this.mode = mode; this.mode = mode;
this.cntSignature.toggleClass('hidden', !this.mode.isSignatureSupport); this.cntSignature.toggleClass('d-none', !this.mode.isSignatureSupport);
this.cntPassword.toggleClass('hidden', !this.mode.isPasswordSupport); this.cntPassword.toggleClass('d-none', !this.mode.isPasswordSupport);
}, },
setApi: function(o) { setApi: function(o) {
@ -2273,7 +2273,7 @@ define([
}, },
updateEncrypt: function() { updateEncrypt: function() {
this.cntPasswordView.toggleClass('hidden', this.btnAddPwd.isVisible()); this.cntPasswordView.toggleClass('d-none', this.btnAddPwd.isVisible());
}, },
strProtect: 'Protect Workbook', strProtect: 'Protect Workbook',

10
apps/spreadsheeteditor/main/app/view/FormatSettingsDialog.js
View file

@ -488,12 +488,12 @@ define([
this.lblExample.text(this.api.asc_getLocaleExample(this.Format)); this.lblExample.text(this.api.asc_getLocaleExample(this.Format));
this._decimalPanel.toggleClass('hidden', !hasDecimal); this._decimalPanel.toggleClass('d-none', !hasDecimal);
this._negativePanel.css('visibility', hasNegative ? '' : 'hidden'); this._negativePanel.css('visibility', hasNegative ? '' : 'hidden');
this._separatorPanel.toggleClass('hidden', !hasSeparator); this._separatorPanel.toggleClass('d-none', !hasSeparator);
this._typePanel.toggleClass('hidden', !hasType); this._typePanel.toggleClass('d-none', !hasType);
this._symbolsPanel.toggleClass('hidden', !hasSymbols); this._symbolsPanel.toggleClass('d-none', !hasSymbols);
this._codePanel.toggleClass('hidden', !hasCode); this._codePanel.toggleClass('d-none', !hasCode);
this._state = { hasDecimal: hasDecimal, hasNegative: hasNegative, hasSeparator: hasSeparator, hasType: hasType, hasSymbols: hasSymbols, hasCode: hasCode}; this._state = { hasDecimal: hasDecimal, hasNegative: hasNegative, hasSeparator: hasSeparator, hasType: hasType, hasSymbols: hasSymbols, hasCode: hasCode};
}, },

10
apps/spreadsheeteditor/main/app/view/FormulaWizard.js
View file

@ -156,9 +156,9 @@ define([
var me = this; var me = this;
if (this.funcprops) { if (this.funcprops) {
var props = this.funcprops; var props = this.funcprops;
props.args ? $('#formula-wizard-args').html('<b>' + props.name + '</b>' + props.args) : $('#formula-wizard-args').addClass('hidden'); props.args ? $('#formula-wizard-args').html('<b>' + props.name + '</b>' + props.args) : $('#formula-wizard-args').addClass('d-none');
props.desc ? $('#formula-wizard-desc').text(props.desc) : $('#formula-wizard-desc').addClass('hidden'); props.desc ? $('#formula-wizard-desc').text(props.desc) : $('#formula-wizard-desc').addClass('d-none');
props.name ? $('#formula-wizard-name').html(this.textFunction + ': ' + props.name) : $('#formula-wizard-name').addClass('hidden'); props.name ? $('#formula-wizard-name').html(this.textFunction + ': ' + props.name) : $('#formula-wizard-name').addClass('d-none');
this.$window.find('#formula-wizard-help').on('click', function (e) { this.$window.find('#formula-wizard-help').on('click', function (e) {
me.showHelp(); me.showHelp();
@ -205,7 +205,7 @@ define([
} }
if (this.args.length<1) { if (this.args.length<1) {
this.panelArgs.text('This function has no arguments'); this.panelArgs.text('This function has no arguments');
this.lblArgDesc.addClass('hidden'); this.lblArgDesc.addClass('d-none');
} else { } else {
if (this.args.length==1 && this.repeatedArg && this.repeatedArg.length<this.maxArgCount) {// add new repeated arguments if (this.args.length==1 && this.repeatedArg && this.repeatedArg.length<this.maxArgCount) {// add new repeated arguments
this.fillArgs(this.repeatedArg); this.fillArgs(this.repeatedArg);
@ -335,7 +335,7 @@ define([
onSelectArgument: function(input) { onSelectArgument: function(input) {
var index = input.options.index, var index = input.options.index,
arg = this.args[index]; arg = this.args[index];
arg.argDesc ? this.lblArgDesc.html('<b>' + arg.argName + ': </b>' + arg.argDesc) : this.lblArgDesc.addClass('hidden'); arg.argDesc ? this.lblArgDesc.html('<b>' + arg.argName + ': </b>' + arg.argDesc) : this.lblArgDesc.addClass('d-none');
if (!this._noApply && index==this.args.length-1 && this.repeatedArg && index+this.repeatedArg.length<this.maxArgCount) {// add new repeated arguments if (!this._noApply && index==this.args.length-1 && this.repeatedArg && index+this.repeatedArg.length<this.maxArgCount) {// add new repeated arguments
this.fillArgs(this.repeatedArg); this.fillArgs(this.repeatedArg);
this.scrollerY.update(); this.scrollerY.update();

6
apps/spreadsheeteditor/main/app/view/HeaderFooterDialog.js
View file

@ -101,9 +101,9 @@ define([
'</table>', '</table>',
'<div class="input-row" style="margin-bottom: 15px; border-bottom: 1px solid #cfcfcf;">', '<div class="input-row" style="margin-bottom: 15px; border-bottom: 1px solid #cfcfcf;">',
'<button type="button" class="btn btn-text-default auto" id="id-dlg-hf-btn-all" style="border-radius: 0;">', this.textAll,'</button>', '<button type="button" class="btn btn-text-default auto" id="id-dlg-hf-btn-all" style="border-radius: 0;">', this.textAll,'</button>',
'<button type="button" class="btn btn-text-default auto hidden" id="id-dlg-hf-btn-odd" style="border-radius: 0;">', this.textOdd,'</button>', '<button type="button" class="btn btn-text-default auto d-none" id="id-dlg-hf-btn-odd" style="border-radius: 0;">', this.textOdd,'</button>',
'<button type="button" class="btn btn-text-default auto hidden" id="id-dlg-hf-btn-even" style="border-radius: 0; margin-left:-1px;">', this.textEven,'</button>', '<button type="button" class="btn btn-text-default auto d-none" id="id-dlg-hf-btn-even" style="border-radius: 0; margin-left:-1px;">', this.textEven,'</button>',
'<button type="button" class="btn btn-text-default auto hidden" id="id-dlg-hf-btn-first" style="border-radius: 0; margin-left:-1px;">', this.textFirst,'</button>', '<button type="button" class="btn btn-text-default auto d-none" id="id-dlg-hf-btn-first" style="border-radius: 0; margin-left:-1px;">', this.textFirst,'</button>',
'</div>', '</div>',
'<label style="display: block; margin-bottom: 3px;">' + this.textHeader + '</label>', '<label style="display: block; margin-bottom: 3px;">' + this.textHeader + '</label>',
'<div id="id-dlg-h-presets" class="input-row" style="display: inline-block; vertical-align: middle;"></div>', '<div id="id-dlg-h-presets" class="input-row" style="display: inline-block; vertical-align: middle;"></div>',

8
apps/spreadsheeteditor/main/app/view/HyperlinkSettingsDialog.js
View file

@ -75,7 +75,7 @@ define([
'</div>', '</div>',
'<div id="id-dlg-hyperlink-url" class="input-row" style="margin-bottom: 5px;"></div>', '<div id="id-dlg-hyperlink-url" class="input-row" style="margin-bottom: 5px;"></div>',
'</div>', '</div>',
'<div id="id-internal-link" class="hidden">', '<div id="id-internal-link" class="d-none">',
'<div class="input-row">', '<div class="input-row">',
'<label>' + this.strLinkTo + '</label>', '<label>' + this.strLinkTo + '</label>',
'<div style="display: inline-block; position: relative;min-width: 150px;float: right;">', '<div style="display: inline-block; position: relative;min-width: 150px;float: right;">',
@ -235,7 +235,7 @@ define([
} }
me.linkGetLink = $('#id-dlg-hyperlink-get-link'); me.linkGetLink = $('#id-dlg-hyperlink-get-link');
me.linkGetLink.toggleClass('hidden', !(me.appOptions && me.appOptions.canMakeActionLink)); me.linkGetLink.toggleClass('d-none', !(me.appOptions && me.appOptions.canMakeActionLink));
me.btnOk = new Common.UI.Button({ me.btnOk = new Common.UI.Button({
el: $window.find('.primary'), el: $window.find('.primary'),
@ -379,8 +379,8 @@ define([
}, },
ShowHideElem: function(value, props) { ShowHideElem: function(value, props) {
this.externalPanel.toggleClass('hidden', value !== Asc.c_oAscHyperlinkType.WebLink); this.externalPanel.toggleClass('d-none', value !== Asc.c_oAscHyperlinkType.WebLink);
this.internalPanel.toggleClass('hidden', value !== Asc.c_oAscHyperlinkType.RangeLink); this.internalPanel.toggleClass('d-none', value !== Asc.c_oAscHyperlinkType.RangeLink);
var store = this.internalList.store; var store = this.internalList.store;
if (value==Asc.c_oAscHyperlinkType.RangeLink) { if (value==Asc.c_oAscHyperlinkType.RangeLink) {
if (store.length<1 && this.settings) { if (store.length<1 && this.settings) {

2
apps/spreadsheeteditor/main/app/view/LeftMenu.js
View file

@ -357,7 +357,7 @@ define([
this.devHeight = this.developerHint.outerHeight(); this.devHeight = this.developerHint.outerHeight();
$(window).on('resize', _.bind(this.onWindowResize, this)); $(window).on('resize', _.bind(this.onWindowResize, this));
} }
this.developerHint.toggleClass('hidden', !mode); this.developerHint.toggleClass('d-none', !mode);
var btns = this.$el.find('button.btn-category:visible'), var btns = this.$el.find('button.btn-category:visible'),
lastbtn = (btns.length>0) ? $(btns[btns.length-1]) : null; lastbtn = (btns.length>0) ? $(btns[btns.length-1]) : null;

6
apps/spreadsheeteditor/main/app/view/NameManagerDlg.js
View file

@ -161,7 +161,7 @@ define([ 'text!spreadsheeteditor/main/app/template/NameManagerDlg.template',
$('#name-manager-sort-scope').on('click', _.bind(this.onSortNames, this, 'scopeName')); $('#name-manager-sort-scope').on('click', _.bind(this.onSortNames, this, 'scopeName'));
this.spanSortName = $('#name-manager-sort-name-span'); this.spanSortName = $('#name-manager-sort-name-span');
this.spanSortScope = $('#name-manager-sort-scope-span'); this.spanSortScope = $('#name-manager-sort-scope-span');
(this.sort.type=='name') ? this.spanSortScope.addClass('hidden') : this.spanSortName.addClass('hidden'); (this.sort.type=='name') ? this.spanSortScope.addClass('d-none') : this.spanSortName.addClass('d-none');
if (this.sort.direction<0) { if (this.sort.direction<0) {
(this.sort.type=='name') ? this.spanSortName.addClass('sort-desc') : this.spanSortScope.addClass('sort-desc'); (this.sort.type=='name') ? this.spanSortName.addClass('sort-desc') : this.spanSortScope.addClass('sort-desc');
} }
@ -343,8 +343,8 @@ define([ 'text!spreadsheeteditor/main/app/template/NameManagerDlg.template',
onSortNames: function(type) { onSortNames: function(type) {
if (type !== this.sort.type) { if (type !== this.sort.type) {
this.sort = {type: type, direction: 1}; this.sort = {type: type, direction: 1};
this.spanSortName.toggleClass('hidden'); this.spanSortName.toggleClass('d-none');
this.spanSortScope.toggleClass('hidden'); this.spanSortScope.toggleClass('d-none');
} else { } else {
this.sort.direction = -this.sort.direction; this.sort.direction = -this.sort.direction;
} }

4
apps/spreadsheeteditor/main/app/view/ShapeSettings.js
View file

@ -1706,14 +1706,14 @@ define([
hideShapeOnlySettings: function(value) { hideShapeOnlySettings: function(value) {
if (this._state.HideShapeOnlySettings !== value) { if (this._state.HideShapeOnlySettings !== value) {
this._state.HideShapeOnlySettings = value; this._state.HideShapeOnlySettings = value;
this.ShapeOnlySettings.toggleClass('hidden', value==true); this.ShapeOnlySettings.toggleClass('d-none', value==true);
} }
}, },
hideChangeTypeSettings: function(value) { hideChangeTypeSettings: function(value) {
if (this._state.HideChangeTypeSettings !== value) { if (this._state.HideChangeTypeSettings !== value) {
this._state.HideChangeTypeSettings = value; this._state.HideChangeTypeSettings = value;
this.CanChangeType.toggleClass('hidden', value==true); this.CanChangeType.toggleClass('d-none', value==true);
} }
}, },

6
apps/spreadsheeteditor/main/app/view/SignatureSettings.js
View file

@ -196,9 +196,9 @@ define([
this.viewValidList.store.reset(validSignatures); this.viewValidList.store.reset(validSignatures);
this.viewInvalidList.store.reset(invalidSignatures); this.viewInvalidList.store.reset(invalidSignatures);
this.$el.find('.requested').toggleClass('hidden', !me._state.hasRequested); this.$el.find('.requested').toggleClass('d-none', !me._state.hasRequested);
this.$el.find('.valid').toggleClass('hidden', !me._state.hasValid); this.$el.find('.valid').toggleClass('d-none', !me._state.hasValid);
this.$el.find('.invalid').toggleClass('hidden', !me._state.hasInvalid); this.$el.find('.invalid').toggleClass('d-none', !me._state.hasInvalid);
me.disableEditing(me._state.hasValid || me._state.hasInvalid); me.disableEditing(me._state.hasValid || me._state.hasInvalid);
}, },