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

[PE] Duplicate Add Slide button in the Insert tab and remove from Collaboration and Plugins tabs.

Browse source
This commit is contained in:
Julia Radzhabova 2017-11-03 14:06:03 +03:00
parent fe063ad6f5
commit 34166fb17c
3 changed files with 91 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
apps/presentationeditor/main/app/controller/Toolbar.js
View file

@ -121,6 +121,7 @@ define([
'insert:text' : this.onInsertText.bind(this),
'insert:textart' : this.onInsertTextart.bind(this),
'insert:shape' : this.onInsertShape.bind(this),
'add:slide' : this.onAddSlide.bind(this),
'change:compact' : this.onClickChangeCompact
},
'FileMenu': {
@ -225,6 +226,10 @@ define([
PE.getCollection('ShapeGroups').bind({
reset: me.onResetAutoshapes.bind(this)
});
PE.getCollection('SlideLayouts').bind({
reset: me.onResetSlides.bind(this)
});
},
attachUIEvents: function(toolbar) {
@ -232,8 +237,6 @@ define([
* UI Events
*/
toolbar.btnAddSlide.on('click', _.bind(this.onBtnAddSlide, this));
toolbar.mnuAddSlidePicker.on('item:click', _.bind(this.onAddSlide, this));
if (toolbar.mnuChangeSlidePicker)
toolbar.mnuChangeSlidePicker.on('item:click', _.bind(this.onChangeSlide, this));
toolbar.btnPreview.on('click', _.bind(this.onPreviewBtnClick, this));
@ -803,23 +806,16 @@ define([
Common.component.Analytics.trackEvent('ToolBar', 'Open Document');
},
onAddSlide: function(picker, item, record) {
if (this.api) {
if (record)
this.api.AddSlide(record.get('data').idx);
onAddSlide: function(type) {
var me = this;
if ( this.api) {
this.api.AddSlide(type);
Common.NotificationCenter.trigger('edit:complete', this.toolbar);
Common.NotificationCenter.trigger('edit:complete', me.toolbar);
Common.component.Analytics.trackEvent('ToolBar', 'Add Slide');
}
},
onBtnAddSlide: function() {
this.api.AddSlide();
Common.NotificationCenter.trigger('edit:complete', this.toolbar);
Common.component.Analytics.trackEvent('ToolBar', 'Add Slide');
},
onChangeSlide: function(picker, item, record) {
if (this.api) {
if (record)
@ -1717,6 +1713,12 @@ define([
}.bind(this));
},
onResetSlides: function () {
setTimeout(function () {
this.toolbar.updateAddSlideMenu(PE.getCollection('SlideLayouts'));
}.bind(this), 0);
},
fillEquations: function() {
if (!this.toolbar.btnInsertEquation.rendered || this.toolbar.btnInsertEquation.menu.items.length>0) return;
@ -2048,7 +2050,7 @@ define([
var toolbar = this.toolbar;
toolbar.$el.find('.toolbar').toggleClass('masked', disable);
this.toolbar.lockToolbar(PE.enumLock.menuFileOpen, disable, {array: [toolbar.btnAddSlide, toolbar.btnChangeSlide, toolbar.btnPreview, toolbar.btnHide]});
this.toolbar.lockToolbar(PE.enumLock.menuFileOpen, disable, {array: [toolbar.btnsAddSlide, toolbar.btnChangeSlide, toolbar.btnPreview, toolbar.btnHide]});
if(disable) {
mask = $("<div class='toolbar-mask'>").appendTo(toolbar.$el.find('.toolbar'));
Common.util.Shortcuts.suspendEvents('command+k, ctrl+k, alt+h, command+f5, ctrl+f5');

12
apps/presentationeditor/main/app/template/Toolbar.template
View file

@ -41,13 +41,13 @@
</div>
</div>
<div class="separator long"></div>
<div class="group">
<span class="btn-slot text x-huge" id="slot-btn-addslide"></span>
</div>
<div class="group" style="display:none;"></div>
</section>
<section class="box-panels">
<section class="panel" data-tab="home">
<div class="group">
<span class="btn-slot text x-huge slot-addslide"></span>
</div>
<div class="group" style="display:none;"></div>
<div class="group">
<div class="elset">
<span class="btn-slot split" id="slot-btn-changeslide"></span>
@ -123,6 +123,10 @@
</div>
</section>
<section class="panel" data-tab="ins">
<div class="group">
<span class="btn-slot text x-huge slot-addslide"></span>
</div>
<div class="group" style="display:none;"></div>
<div class="separator long"></div>
<div class="group">
<span class="btn-slot text x-huge" id="slot-btn-inserttable"></span>

113
apps/presentationeditor/main/app/view/Toolbar.js
View file

@ -166,17 +166,6 @@ define([
*/
var _set = PE.enumLock;
me.btnAddSlide = new Common.UI.Button({
id : 'id-toolbar-button-add-slide',
cls : 'btn-toolbar x-huge icon-top',
iconCls : 'btn-addslide',
split : true,
caption : me.capAddSlide,
lock : [_set.menuFileOpen, _set.slideDeleted, _set.lostConnect, _set.disableOnStart],
menu : true
});
me.slideOnlyControls.push(me.btnAddSlide);
me.btnChangeSlide = new Common.UI.Button({
id : 'id-toolbar-button-change-slide',
cls : 'btn-toolbar',
@ -829,7 +818,7 @@ define([
'</div>'
].join(''));
this.lockControls = [ this.btnAddSlide, this.btnChangeSlide, this.btnSave,
this.lockControls = [ this.btnChangeSlide, this.btnSave,
this.btnCopy, this.btnPaste, this.btnUndo, this.btnRedo, this.cmbFontName, this.cmbFontSize,
this.btnBold, this.btnItalic, this.btnUnderline, this.btnStrikeout, this.btnSuperscript,
this.btnSubscript, this.btnFontColor, this.btnClearStyle, this.btnCopyStyle, this.btnMarkers,
@ -956,7 +945,6 @@ define([
_injectComponent('#slot-field-fontname', this.cmbFontName);
_injectComponent('#slot-field-fontsize', this.cmbFontSize);
_injectComponent('#slot-btn-addslide', this.btnAddSlide);
_injectComponent('#slot-btn-changeslide', this.btnChangeSlide);
_injectComponent('#slot-btn-preview', this.btnPreview);
_injectComponent('#slot-btn-print', this.btnPrint);
@ -1048,7 +1036,20 @@ define([
}
});
var created = me.btnsInsertImage.concat(me.btnsInsertText, me.btnsInsertShape);
me.btnsAddSlide = _injectBtns({
slot: '.slot-addslide',
btnconfig: {
id : 'tlbtn-addslide-',
cls : 'btn-toolbar x-huge icon-top',
iconCls : 'btn-addslide',
split : true,
caption : me.capAddSlide,
lock : [PE.enumLock.menuFileOpen, PE.enumLock.slideDeleted, PE.enumLock.lostConnect, PE.enumLock.disableOnStart],
menu : true
}
});
var created = me.btnsInsertImage.concat(me.btnsInsertText, me.btnsInsertShape, me.btnsAddSlide);
this.lockToolbar(PE.enumLock.disableOnStart, true, {array: created});
Array.prototype.push.apply(me.slideOnlyControls, created);
@ -1092,11 +1093,24 @@ define([
})
);
});
me.btnsAddSlide.forEach(function (btn, index) {
btn.updateHint(me.tipAddSlide + Common.Utils.String.platformKey('Ctrl+M'));
btn.setMenu(
new Common.UI.Menu({
items: [
{template: _.template('<div id="id-toolbar-menu-addslide-' + index + '" class="menu-layouts" style="width: 302px; margin: 0 4px;"></div>')}
]
})
);
btn.on('click', function (btn, e) {
me.fireEvent('add:slide');
});
});
},
createDelayedElements: function () {
// set hints
this.btnAddSlide.updateHint(this.tipAddSlide + Common.Utils.String.platformKey('Ctrl+M'));
this.btnChangeSlide.updateHint(this.tipChangeSlide);
this.btnPreview.updateHint(this.tipPreview);
this.btnPrint.updateHint(this.tipPrint + Common.Utils.String.platformKey('Ctrl+P'));
@ -1213,14 +1227,6 @@ define([
})
);
this.btnAddSlide.setMenu(
new Common.UI.Menu({
items: [
{template: _.template('<div id="id-toolbar-menu-addslide" class="menu-layouts" style="width: 302px; margin: 0 4px;"></div>')}
]
})
);
this.btnChangeSlide.setMenu(
new Common.UI.Menu({
items: [
@ -1328,29 +1334,6 @@ define([
maxColumns: 10
});
this.mnuAddSlidePicker = new Common.UI.DataView({
el: $('#id-toolbar-menu-addslide'),
parentMenu: this.btnAddSlide.menu,
showLast: false,
restoreHeight: 300,
style: 'max-height: 300px;',
store: PE.getCollection('SlideLayouts'),
itemTemplate: _.template([
'<div class="layout" id="<%= id %>" style="width: <%= itemWidth %>px;">',
'<div style="background-image: url(<%= imageUrl %>); width: <%= itemWidth %>px; height: <%= itemHeight %>px;"/>',
'<div class="title"><%= title %></div> ',
'</div>'
].join(''))
});
if (this.btnAddSlide.menu) {
this.btnAddSlide.menu.on('show:after', function () {
me.onSlidePickerShowAfter(me.mnuAddSlidePicker);
me.mnuAddSlidePicker.scroller.update({alwaysVisibleY: true});
me.mnuAddSlidePicker.scroller.scrollTop(0);
});
}
this.mnuAddSlidePicker._needRecalcSlideLayout = true;
var createDataPicker = function (btn) {
me.mnuChangeSlidePicker = new Common.UI.DataView({
el: $('#id-toolbar-menu-changeslide'),
@ -1382,7 +1365,6 @@ define([
this.btnChangeSlide.on('render:after', createDataPicker);
this.listenTo(PE.getCollection('SlideLayouts'), 'reset', function () {
me.mnuAddSlidePicker._needRecalcSlideLayout = true;
if (me.mnuChangeSlidePicker)
me.mnuChangeSlidePicker._needRecalcSlideLayout = true;
});
@ -1710,6 +1692,43 @@ define([
}
},
updateAddSlideMenu: function(collection) {
if (collection.size()<1) return;
var me = this;
me.btnsAddSlide.forEach(function (btn, index) {
if ( !btn.mnuAddSlidePicker ) {
btn.mnuAddSlidePicker = new Common.UI.DataView({
el: $('#id-toolbar-menu-addslide-' + index),
parentMenu: btn.menu,
showLast: false,
restoreHeight: 300,
style: 'max-height: 300px;',
store: PE.getCollection('SlideLayouts'),
itemTemplate: _.template([
'<div class="layout" id="<%= id %>" style="width: <%= itemWidth %>px;">',
'<div style="background-image: url(<%= imageUrl %>); width: <%= itemWidth %>px; height: <%= itemHeight %>px;"/>',
'<div class="title"><%= title %></div> ',
'</div>'
].join(''))
});
btn.mnuAddSlidePicker.on('item:click', function (picker, item, record, e) {
if (e.type !== 'click') Common.UI.Menu.Manager.hideAll();
if (record)
me.fireEvent('add:slide', [record.get('data').idx]);
});
if (btn.menu) {
btn.menu.on('show:after', function () {
me.onSlidePickerShowAfter(btn.mnuAddSlidePicker);
btn.mnuAddSlidePicker.scroller.update({alwaysVisibleY: true});
btn.mnuAddSlidePicker.scroller.scrollTop(0);
});
}
}
btn.mnuAddSlidePicker._needRecalcSlideLayout = true;
});
},
textBold: 'Bold',
textItalic: 'Italic',
textUnderline: 'Underline',