diff --git a/apps/documenteditor/mobile/app/controller/Main.js b/apps/documenteditor/mobile/app/controller/Main.js index 846cfe85f..c427f4b93 100644 --- a/apps/documenteditor/mobile/app/controller/Main.js +++ b/apps/documenteditor/mobile/app/controller/Main.js @@ -42,9 +42,12 @@ define([ 'core', + 'jquery', + 'underscore', + 'backbone', 'irregularstack', 'common/main/lib/util/LocalStorage' -], function () { +], function (core, $, _, Backbone) { 'use strict'; DE.Controllers.Main = Backbone.Controller.extend(_.extend((function() { diff --git a/apps/documenteditor/mobile/app/controller/add/AddOther.js b/apps/documenteditor/mobile/app/controller/add/AddOther.js index fde359802..29b0f526d 100644 --- a/apps/documenteditor/mobile/app/controller/add/AddOther.js +++ b/apps/documenteditor/mobile/app/controller/add/AddOther.js @@ -86,7 +86,7 @@ define([ initEvents: function () { var me = this; $('#add-other-pagebreak').single('click', _.bind(me.onPageBreak, me)); - $('#add-other-linebreak').single('click', _.bind(me.onLineBreak, me)); + $('#add-other-columnbreak').single('click', _.bind(me.onColumnBreak, me)); }, onPageShow: function (view, pageId) { @@ -144,8 +144,8 @@ define([ DE.getController('AddContainer').hideModal(); }, - onLineBreak: function (e) { - this.api && this.api.put_AddLineBreak(); + onColumnBreak: function () { + this.api && this.api.put_AddColumnBreak(); DE.getController('AddContainer').hideModal(); }, diff --git a/apps/documenteditor/mobile/app/template/AddOther.template b/apps/documenteditor/mobile/app/template/AddOther.template index 8b61a6652..36c324b5c 100644 --- a/apps/documenteditor/mobile/app/template/AddOther.template +++ b/apps/documenteditor/mobile/app/template/AddOther.template @@ -14,6 +14,18 @@ +
  • + +
    +
    + +
    +
    +
    <%= scope.textColumnBreak %>
    +
    +
    +
    +
  • @@ -26,18 +38,6 @@
  • -
  • - -
    -
    - -
    -
    -
    <%= scope.textLineBreak %>
    -
    -
    -
    -
  • diff --git a/apps/documenteditor/mobile/app/view/add/AddOther.js b/apps/documenteditor/mobile/app/view/add/AddOther.js index 5abd44def..ae65a239b 100644 --- a/apps/documenteditor/mobile/app/view/add/AddOther.js +++ b/apps/documenteditor/mobile/app/view/add/AddOther.js @@ -139,7 +139,7 @@ define([ textPageBreak: 'Page Break', textSectionBreak: 'Section Break', - textLineBreak: 'Line Break', + textColumnBreak: 'Column Break', textLink: 'Link', textPageNumber: 'Page Number', textBack: 'Back', diff --git a/apps/documenteditor/mobile/locale/en.json b/apps/documenteditor/mobile/locale/en.json index 4acb860fc..545319617 100644 --- a/apps/documenteditor/mobile/locale/en.json +++ b/apps/documenteditor/mobile/locale/en.json @@ -159,7 +159,7 @@ "DE.Controllers.AddOther.txtNotUrl": "This field should be a URL in the format 'http://www.example.com'", "DE.Views.AddOther.textPageBreak": "Page Break", "DE.Views.AddOther.textSectionBreak": "Section Break", - "DE.Views.AddOther.textLineBreak": "Line Break", + "DE.Views.AddOther.textColumnBreak": "Column Break", "DE.Views.AddOther.textLink": "Link", "DE.Views.AddOther.textPageNumber": "Page Number", "DE.Views.AddOther.textBack": "Back",