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

[DE mobile] Replace ‘Line Break’ on ‘Column Break’

Browse source
This commit is contained in:
Alexander Yuzhin 2016-12-05 14:12:35 +03:00
parent f12413af21
commit ef694c4cc5
5 changed files with 21 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/documenteditor/mobile/app/controller/Main.js
View file

@ -42,9 +42,12 @@
define([ define([
'core', 'core',
'jquery',
'underscore',
'backbone',
'irregularstack', 'irregularstack',
'common/main/lib/util/LocalStorage' 'common/main/lib/util/LocalStorage'
], function () { ], function (core, $, _, Backbone) {
'use strict'; 'use strict';
DE.Controllers.Main = Backbone.Controller.extend(_.extend((function() { DE.Controllers.Main = Backbone.Controller.extend(_.extend((function() {

6
apps/documenteditor/mobile/app/controller/add/AddOther.js
View file

@ -86,7 +86,7 @@ define([
initEvents: function () { initEvents: function () {
var me = this; var me = this;
$('#add-other-pagebreak').single('click', _.bind(me.onPageBreak, me)); $('#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) { onPageShow: function (view, pageId) {
@ -144,8 +144,8 @@ define([
DE.getController('AddContainer').hideModal(); DE.getController('AddContainer').hideModal();
}, },
onLineBreak: function (e) { onColumnBreak: function () {
this.api && this.api.put_AddLineBreak(); this.api && this.api.put_AddColumnBreak();
DE.getController('AddContainer').hideModal(); DE.getController('AddContainer').hideModal();
}, },

24
apps/documenteditor/mobile/app/template/AddOther.template
View file

@ -14,6 +14,18 @@
</div> </div>
</a> </a>
</li> </li>
<li>
<a id="add-other-columnbreak" class="item-link no-indicator">
<div class="item-content">
<div class="item-media">
<i class="icon icon-stringbreak"></i>
</div>
<div class="item-inner">
<div class="item-title"><%= scope.textColumnBreak %></div>
</div>
</div>
</a>
</li>
<li> <li>
<a id="add-other-section" class="item-link"> <a id="add-other-section" class="item-link">
<div class="item-content"> <div class="item-content">
@ -26,18 +38,6 @@
</div> </div>
</a> </a>
</li> </li>
<li>
<a id="add-other-linebreak" class="item-link no-indicator">
<div class="item-content">
<div class="item-media">
<i class="icon icon-stringbreak"></i>
</div>
<div class="item-inner">
<div class="item-title"><%= scope.textLineBreak %></div>
</div>
</div>
</a>
</li>
<li> <li>
<a id="add-other-link" class="item-link"> <a id="add-other-link" class="item-link">
<div class="item-content"> <div class="item-content">

2
apps/documenteditor/mobile/app/view/add/AddOther.js
View file

@ -139,7 +139,7 @@ define([
textPageBreak: 'Page Break', textPageBreak: 'Page Break',
textSectionBreak: 'Section Break', textSectionBreak: 'Section Break',
textLineBreak: 'Line Break', textColumnBreak: 'Column Break',
textLink: 'Link', textLink: 'Link',
textPageNumber: 'Page Number', textPageNumber: 'Page Number',
textBack: 'Back', textBack: 'Back',

2
apps/documenteditor/mobile/locale/en.json
View file

@ -159,7 +159,7 @@
"DE.Controllers.AddOther.txtNotUrl": "This field should be a URL in the format 'http://www.example.com'", "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.textPageBreak": "Page Break",
"DE.Views.AddOther.textSectionBreak": "Section 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.textLink": "Link",
"DE.Views.AddOther.textPageNumber": "Page Number", "DE.Views.AddOther.textPageNumber": "Page Number",
"DE.Views.AddOther.textBack": "Back", "DE.Views.AddOther.textBack": "Back",