diff --git a/apps/common/main/lib/view/ListSettingsDialog.js b/apps/common/main/lib/view/ListSettingsDialog.js index 0ad77ce61..3a59dfd72 100644 --- a/apps/common/main/lib/view/ListSettingsDialog.js +++ b/apps/common/main/lib/view/ListSettingsDialog.js @@ -366,7 +366,7 @@ define([ _handleInput: function(state) { if (this.options.handler) { var listtype = (this.type==0) ? this.cmbBulletFormat.getValue() : this.cmbNumFormat.getValue(); - this.options.handler.call(this, state, (listtype==-1) ? null : this._changedProps); + this.options.handler.call(this, state, (listtype==-1) ? -1 : this._changedProps); } this.close(); }, diff --git a/apps/presentationeditor/main/app/controller/Toolbar.js b/apps/presentationeditor/main/app/controller/Toolbar.js index 70d361b9f..9e012cc0f 100644 --- a/apps/presentationeditor/main/app/controller/Toolbar.js +++ b/apps/presentationeditor/main/app/controller/Toolbar.js @@ -1141,7 +1141,12 @@ define([ handler: function(result, value) { if (result == 'ok') { if (me.api) { - me.api.paraApply(value); + if (value==-1) + me.api.put_ListType(0, -1); + else { + props.asc_putBullet(value); + me.api.paraApply(props); + } } } Common.NotificationCenter.trigger('edit:complete', me.toolbar);