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

[SE ios] Fixed display alert

Browse source
This commit is contained in:
Alexander Yuzhin 2017-01-19 11:37:14 +03:00
parent bf03cc98de
commit 3b54d5df2a
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
apps/spreadsheeteditor/mobile/app/controller/DocumentHolder.js
View file

@ -42,8 +42,11 @@
define([ define([
'core', 'core',
'jquery',
'underscore',
'backbone',
'spreadsheeteditor/mobile/app/view/DocumentHolder' 'spreadsheeteditor/mobile/app/view/DocumentHolder'
], function (core) { ], function (core, $, _, Backbone) {
'use strict'; 'use strict';
SSE.Controllers.DocumentHolder = Backbone.Controller.extend(_.extend((function() { SSE.Controllers.DocumentHolder = Backbone.Controller.extend(_.extend((function() {
@ -113,8 +116,10 @@ define([
break; break;
case 'merge': case 'merge':
if (me.api.asc_mergeCellsDataLost(Asc.c_oAscMergeOptions.Merge)) { if (me.api.asc_mergeCellsDataLost(Asc.c_oAscMergeOptions.Merge)) {
uiApp.confirm(me.warnMergeLostData, undefined, function(){ _.defer(function () {
me.api.asc_mergeCells(Asc.c_oAscMergeOptions.Merge); uiApp.confirm(me.warnMergeLostData, undefined, function(){
me.api.asc_mergeCells(Asc.c_oAscMergeOptions.Merge);
});
}); });
} else { } else {
me.api.asc_mergeCells(Asc.c_oAscMergeOptions.Merge); me.api.asc_mergeCells(Asc.c_oAscMergeOptions.Merge);