From 3b54d5df2ac95f78962951121007ba44915442fd Mon Sep 17 00:00:00 2001 From: Alexander Yuzhin Date: Thu, 19 Jan 2017 11:37:14 +0300 Subject: [PATCH] [SE ios] Fixed display alert --- .../mobile/app/controller/DocumentHolder.js | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/apps/spreadsheeteditor/mobile/app/controller/DocumentHolder.js b/apps/spreadsheeteditor/mobile/app/controller/DocumentHolder.js index ecc260bc5..6ea99df2c 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/DocumentHolder.js +++ b/apps/spreadsheeteditor/mobile/app/controller/DocumentHolder.js @@ -42,8 +42,11 @@ define([ 'core', + 'jquery', + 'underscore', + 'backbone', 'spreadsheeteditor/mobile/app/view/DocumentHolder' -], function (core) { +], function (core, $, _, Backbone) { 'use strict'; SSE.Controllers.DocumentHolder = Backbone.Controller.extend(_.extend((function() { @@ -113,8 +116,10 @@ define([ break; case 'merge': if (me.api.asc_mergeCellsDataLost(Asc.c_oAscMergeOptions.Merge)) { - uiApp.confirm(me.warnMergeLostData, undefined, function(){ - me.api.asc_mergeCells(Asc.c_oAscMergeOptions.Merge); + _.defer(function () { + uiApp.confirm(me.warnMergeLostData, undefined, function(){ + me.api.asc_mergeCells(Asc.c_oAscMergeOptions.Merge); + }); }); } else { me.api.asc_mergeCells(Asc.c_oAscMergeOptions.Merge);