Refactoring
This commit is contained in:
parent
7be244bf6e
commit
f2df650781
|
@ -339,22 +339,21 @@ define([
|
||||||
var me = this,
|
var me = this,
|
||||||
recents = Common.localStorage.getItem('de-recent-shapes');
|
recents = Common.localStorage.getItem('de-recent-shapes');
|
||||||
|
|
||||||
for (var i = 0; i < 2; i++) {
|
var menuitem = new Common.UI.MenuItem({
|
||||||
var menuitem = new Common.UI.MenuItem({
|
template: _.template('<div id="id-img-change-shape-menu-<%= options.index %>" class="menu-insertshape"></div>'),
|
||||||
template: _.template('<div id="id-change-shape-menu-<%= options.index %>" class="menu-insertshape"></div>'),
|
index: 0
|
||||||
index: i
|
|
||||||
});
|
});
|
||||||
me.btnChangeShape.menu.addItem(menuitem);
|
me.btnChangeShape.menu.addItem(menuitem);
|
||||||
|
|
||||||
var shapePicker = new Common.UI.DataViewShape({
|
var shapePicker = new Common.UI.DataViewShape({
|
||||||
el: $('#id-change-shape-menu-' + i),
|
el: $('#id-img-change-shape-menu-' + 0),
|
||||||
itemTemplate: _.template('<div class="item-shape" id="<%= id %>"><svg width="20" height="20" class=\"icon\"><use xlink:href=\"#svg-icon-<%= data.shapeType %>\"></use></svg></div>'),
|
itemTemplate: _.template('<div class="item-shape" id="<%= id %>"><svg width="20" height="20" class=\"icon\"><use xlink:href=\"#svg-icon-<%= data.shapeType %>\"></use></svg></div>'),
|
||||||
groups: me.application.getCollection('ShapeGroups'),
|
groups: me.application.getCollection('ShapeGroups'),
|
||||||
parentMenu: me.btnChangeShape.menu,
|
parentMenu: me.btnChangeShape.menu,
|
||||||
restoreHeight: 640,
|
restoreHeight: 640,
|
||||||
textRecentlyUsed: me.textRecentlyUsed,
|
textRecentlyUsed: me.textRecentlyUsed,
|
||||||
recentShapes: recents ? JSON.parse(recents) : null,
|
recentShapes: recents ? JSON.parse(recents) : null,
|
||||||
isFromImage: i === 0
|
isFromImage: true
|
||||||
});
|
});
|
||||||
shapePicker.on('item:click', function(picker, item, record, e) {
|
shapePicker.on('item:click', function(picker, item, record, e) {
|
||||||
if (me.api) {
|
if (me.api) {
|
||||||
|
@ -364,9 +363,6 @@ define([
|
||||||
if (e.type !== 'click')
|
if (e.type !== 'click')
|
||||||
me.btnChangeShape.menu.hide();
|
me.btnChangeShape.menu.hide();
|
||||||
});
|
});
|
||||||
}
|
|
||||||
/*me.btnChangeShape.menu.items[0].setVisible(me._state.isFromImage);
|
|
||||||
me.btnChangeShape.menu.items[1].setVisible(!me._state.isFromImage);*/
|
|
||||||
},
|
},
|
||||||
|
|
||||||
ChangeSettings: function(props) {
|
ChangeSettings: function(props) {
|
||||||
|
@ -376,6 +372,7 @@ define([
|
||||||
this.disableControls(this._locked);
|
this.disableControls(this._locked);
|
||||||
|
|
||||||
if (props ){
|
if (props ){
|
||||||
|
|
||||||
this._originalProps = new Asc.asc_CImgProperty(props);
|
this._originalProps = new Asc.asc_CImgProperty(props);
|
||||||
|
|
||||||
var value = props.get_WrappingStyle();
|
var value = props.get_WrappingStyle();
|
||||||
|
|
Loading…
Reference in a new issue