Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
W
web-apps
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boris Kocherov
web-apps
Commits
ef694c4c
Commit
ef694c4c
authored
Dec 05, 2016
by
Alexander Yuzhin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[DE mobile] Replace ‘Line Break’ on ‘Column Break’
parent
f12413af
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
15 additions
and
12 deletions
+15
-12
apps/documenteditor/mobile/app/controller/Main.js
apps/documenteditor/mobile/app/controller/Main.js
+4
-1
apps/documenteditor/mobile/app/controller/add/AddOther.js
apps/documenteditor/mobile/app/controller/add/AddOther.js
+3
-3
apps/documenteditor/mobile/app/template/AddOther.template
apps/documenteditor/mobile/app/template/AddOther.template
+6
-6
apps/documenteditor/mobile/app/view/add/AddOther.js
apps/documenteditor/mobile/app/view/add/AddOther.js
+1
-1
apps/documenteditor/mobile/locale/en.json
apps/documenteditor/mobile/locale/en.json
+1
-1
No files found.
apps/documenteditor/mobile/app/controller/Main.js
View file @
ef694c4c
...
...
@@ -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
()
{
...
...
apps/documenteditor/mobile/app/controller/add/AddOther.js
View file @
ef694c4c
...
...
@@ -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
.
onLine
Break
,
me
));
$
(
'
#add-other-
columnbreak
'
).
single
(
'
click
'
,
_
.
bind
(
me
.
onColumn
Break
,
me
));
},
onPageShow
:
function
(
view
,
pageId
)
{
...
...
@@ -144,8 +144,8 @@ define([
DE
.
getController
(
'
AddContainer
'
).
hideModal
();
},
on
LineBreak
:
function
(
e
)
{
this
.
api
&&
this
.
api
.
put_Add
Line
Break
();
on
ColumnBreak
:
function
(
)
{
this
.
api
&&
this
.
api
.
put_Add
Column
Break
();
DE
.
getController
(
'
AddContainer
'
).
hideModal
();
},
...
...
apps/documenteditor/mobile/app/template/AddOther.template
View file @
ef694c4c
...
...
@@ -15,25 +15,25 @@
</a>
</li>
<li>
<a id="add-other-
section" class="item-link
">
<a id="add-other-
columnbreak" class="item-link no-indicator
">
<div class="item-content">
<div class="item-media">
<i class="icon icon-s
ection
break"></i>
<i class="icon icon-s
tring
break"></i>
</div>
<div class="item-inner">
<div class="item-title"><%= scope.text
Sectio
nBreak %></div>
<div class="item-title"><%= scope.text
Colum
nBreak %></div>
</div>
</div>
</a>
</li>
<li>
<a id="add-other-
linebreak" class="item-link no-indicator
">
<a id="add-other-
section" class="item-link
">
<div class="item-content">
<div class="item-media">
<i class="icon icon-s
tring
break"></i>
<i class="icon icon-s
ection
break"></i>
</div>
<div class="item-inner">
<div class="item-title"><%= scope.text
Line
Break %></div>
<div class="item-title"><%= scope.text
Section
Break %></div>
</div>
</div>
</a>
...
...
apps/documenteditor/mobile/app/view/add/AddOther.js
View file @
ef694c4c
...
...
@@ -139,7 +139,7 @@ define([
textPageBreak
:
'
Page Break
'
,
textSectionBreak
:
'
Section Break
'
,
text
LineBreak
:
'
Line
Break
'
,
text
ColumnBreak
:
'
Column
Break
'
,
textLink
:
'
Link
'
,
textPageNumber
:
'
Page Number
'
,
textBack
:
'
Back
'
,
...
...
apps/documenteditor/mobile/locale/en.json
View file @
ef694c4c
...
...
@@ -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.text
LineBreak"
:
"Line
Break"
,
"DE.Views.AddOther.text
ColumnBreak"
:
"Column
Break"
,
"DE.Views.AddOther.textLink"
:
"Link"
,
"DE.Views.AddOther.textPageNumber"
:
"Page Number"
,
"DE.Views.AddOther.textBack"
:
"Back"
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment