Skip to content

W
web-apps
Commit eab5a97e authored by Julia Radzhabova's avatar Julia Radzhabova
Browse files
Options

[PE mobile] Fix bugs.

parent 5dda2832
Show whitespace changes
Inline Side-by-side
Showing with 91 additions and 34 deletions
apps/presentationeditor/mobile/app/controller/DocumentHolder.js
View file @ eab5a97e
......@@ -47,7 +47,7 @@ define([
'underscore',
'backbone',
'presentationeditor/mobile/app/view/DocumentHolder'
], function (core) {
], function (core, $, _, Backbone) {
'use strict';
PE.Controllers.DocumentHolder = Backbone.Controller.extend(_.extend((function() {
......
apps/presentationeditor/mobile/app/controller/DocumentPreview.js
View file @ eab5a97e
......@@ -47,7 +47,7 @@ define([
'underscore',
'backbone',
'presentationeditor/mobile/app/view/DocumentPreview'
], function (core) {
], function (core, $, _, Backbone) {
'use strict';
PE.Controllers.DocumentPreview = Backbone.Controller.extend(_.extend((function() {
......
apps/presentationeditor/mobile/app/controller/Main.js
View file @ eab5a97e
......@@ -42,9 +42,12 @@
define([
'core',
'jquery',
'underscore',
'backbone',
'irregularstack',
'common/main/lib/util/LocalStorage'
], function () {
], function (core, $, _, Backbone) {
'use strict';
PE.Controllers.Main = Backbone.Controller.extend(_.extend((function() {
......
apps/presentationeditor/mobile/app/controller/Settings.js
View file @ eab5a97e
......@@ -43,8 +43,11 @@
define([
'core',
'jquery',
'underscore',
'backbone',
'presentationeditor/mobile/app/view/Settings'
], function (core) {
], function (core, $, _, Backbone) {
'use strict';
PE.Controllers.Settings = Backbone.Controller.extend(_.extend((function() {
......
apps/presentationeditor/mobile/app/controller/add/AddContainer.js
View file @ eab5a97e
......@@ -87,20 +87,6 @@ define([
}
},
_dummyEditController: function () {
var layout =
'<div class="content-block inset">' +
'<div class="content-block-inner"> ' +
'<p>Under Construction</p>' +
'</div>' +
'</div>';
return {
getCaption: function () { return 'Dummy' },
getLayout : function () { return layout }
}
},
_layoutEditorsByStack: function () {
var me = this,
addViews = [];
......
apps/presentationeditor/mobile/app/controller/edit/EditContainer.js
View file @ eab5a97e
......@@ -40,8 +40,11 @@
*
*/
define([
'core'
], function (core) {
'core',
'jquery',
'underscore',
'backbone'
], function (core, $, _, Backbone) {
'use strict';
PE.Controllers.EditContainer = Backbone.Controller.extend(_.extend((function() {
......
apps/presentationeditor/mobile/app/controller/edit/EditImage.js
View file @ eab5a97e
......@@ -42,8 +42,11 @@
define([
'core',
'presentationeditor/mobile/app/view/edit/EditImage'
], function (core) {
'presentationeditor/mobile/app/view/edit/EditImage',
'jquery',
'underscore',
'backbone'
], function (core, view, $, _, Backbone) {
'use strict';
PE.Controllers.EditImage = Backbone.Controller.extend(_.extend((function() {
......
apps/presentationeditor/mobile/app/controller/edit/EditShape.js
View file @ eab5a97e
......@@ -42,8 +42,11 @@
define([
'core',
'presentationeditor/mobile/app/view/edit/EditShape'
], function (core) {
'presentationeditor/mobile/app/view/edit/EditShape',
'jquery',
'underscore',
'backbone'
], function (core, view, $, _, Backbone) {
'use strict';
PE.Controllers.EditShape = Backbone.Controller.extend(_.extend((function() {
......
apps/presentationeditor/mobile/app/controller/edit/EditSlide.js
View file @ eab5a97e
......@@ -42,8 +42,11 @@
define([
'core',
'presentationeditor/mobile/app/view/edit/EditSlide'
], function (core) {
'presentationeditor/mobile/app/view/edit/EditSlide',
'jquery',
'underscore',
'backbone'
], function (core, view, $, _, Backbone) {
'use strict';
PE.Controllers.EditSlide = Backbone.Controller.extend(_.extend((function() {
......
apps/presentationeditor/mobile/app/controller/edit/EditTable.js
View file @ eab5a97e
......@@ -42,8 +42,11 @@
define([
'core',
'presentationeditor/mobile/app/view/edit/EditTable'
], function (core) {
'presentationeditor/mobile/app/view/edit/EditTable',
'jquery',
'underscore',
'backbone'
], function (core, view, $, _, Backbone) {
'use strict';
PE.Controllers.EditTable = Backbone.Controller.extend(_.extend((function() {
......
apps/presentationeditor/mobile/app/controller/edit/EditText.js
View file @ eab5a97e
......@@ -42,8 +42,12 @@
define([
'core',
'presentationeditor/mobile/app/view/edit/EditText'
], function (core) {
'presentationeditor/mobile/app/view/edit/EditText',
'jquery',
'underscore',
'backbone',
'common/mobile/lib/component/ThemeColorPalette'
], function (core, view, $, _, Backbone) {
'use strict';
PE.Controllers.EditText = Backbone.Controller.extend(_.extend((function() {
......
apps/presentationeditor/mobile/app/template/Settings.template
View file @ eab5a97e
......@@ -188,7 +188,7 @@
<a data-format="513" class="item-link no-indicator">
<div class="item-content">
<div class="item-media">
<i class="icon icon-search"></i>
<i class="icon icon-format-pdf"></i>
</div>
<div class="item-inner">
<div class="item-title">PDF</div>
......@@ -223,7 +223,7 @@
</div>
<div class="content-block">
<h3>PRESENTATION EDITOR</h3>
<h3><%= scope.textVersion %> 4.2</h3>
<h3><%= scope.textVersion %> 4.3</h3>
</div>
<div class="content-block">
<h3 class="vendor">Ascensio System SIA</h3>
......
apps/presentationeditor/mobile/resources/css/app-ios.css
View file @ eab5a97e
This source diff could not be displayed because it is too large. You can view the blob instead.
apps/presentationeditor/mobile/resources/css/app-material.css
View file @ eab5a97e
This source diff could not be displayed because it is too large. You can view the blob instead.
apps/presentationeditor/mobile/resources/less/ios/_icons.less
View file @ eab5a97e
......@@ -195,6 +195,12 @@ i.icon {
height: 22px;
.encoded-svg-background('<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 22 22" fill="@{themeColor}"><g><path d="M12.4,9.8c0,0-2.1-0.1-3.8,1.2c-2.8,2-3.3,4.3-3.3,4.3s1.6-1.7,3.5-2.5c1.7-0.7,3.7-0.4,3.7-0.4v1.9l4.8-3.3V11l-4.8-3.3V9.8z M11,1C5.5,1,1,5.5,1,11c0,5.5,4.5,10,10,10s10-4.5,10-10C21,5.5,16.5,1,11,1z M11,20c-5,0-9-4.1-9-9C2,6,6,2,11,2s9,4.1,9,9C20,16,16,20,11,20z"/></g></svg>');
}
&.icon-image-library {
width: 22px;
height: 22px;
.encoded-svg-background('<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 22 22"><defs><style>.cls-1{isolation:isolate;}.cls-2{opacity:0.2;}.cls-3{fill:#fff;}.cls-10,.cls-11,.cls-4,.cls-6,.cls-7,.cls-8,.cls-9{mix-blend-mode:multiply;}.cls-4{fill:url(#grad_8);}.cls-5{fill:url(#grad_10);}.cls-6{fill:url(#grad_12);}.cls-7{fill:url(#grad_14);}.cls-8{fill:url(#grad_79);}.cls-9{fill:url(#grad_77);}.cls-10{fill:url(#grad_75);}.cls-11{fill:url(#grad_81);}</style><linearGradient id="grad_8" x1="11.08" y1="10.26" x2="11.08" y2="1.26" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#f3e916"/><stop offset="1" stop-color="#f89d34"/></linearGradient><linearGradient id="grad_10" x1="11.08" y1="20.44" x2="11.08" y2="11.88" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#5eb6e8"/><stop offset="1" stop-color="#958cc3"/></linearGradient><linearGradient id="grad_12" x1="1.46" y1="11.05" x2="10.46" y2="11.05" gradientTransform="translate(17 5.09) rotate(90)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#cc8dba"/><stop offset="1" stop-color="#f86867"/></linearGradient><linearGradient id="grad_14" x1="11.73" y1="11.05" x2="20.73" y2="11.05" gradientTransform="translate(27.28 -5.18) rotate(90)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#6ac07f"/><stop offset="1" stop-color="#c5da3d"/></linearGradient><linearGradient id="grad_79" x1="11.74" y1="10.42" x2="17.52" y2="4.63" gradientTransform="translate(30.29 2.51) rotate(135)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#c5da3d"/><stop offset="1" stop-color="#f3e916"/></linearGradient><linearGradient id="grad_77" x1="4.7" y1="17.49" x2="10.48" y2="11.71" gradientTransform="translate(23.24 19.65) rotate(135)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#9595c3"/><stop offset="1" stop-color="#cc8dba"/></linearGradient><linearGradient id="grad_75" x1="4.69" y1="4.64" x2="10.47" y2="10.42" gradientTransform="translate(7.54 -3.15) rotate(45)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#f86867"/><stop offset="1" stop-color="#f89d34"/></linearGradient><linearGradient id="grad_81" x1="11.77" y1="11.78" x2="17.55" y2="17.56" gradientTransform="translate(14.63 -6.05) rotate(45)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#5ec0e8"/><stop offset="1" stop-color="#6ac07f"/></linearGradient></defs><title>icons_for_svg</title><g class="cls-1"><g id="Слой_1" data-name="Слой 1"><rect class="cls-2" x="0.09" y="0.01" width="22" height="22" rx="4" ry="4"/><rect class="cls-3" x="0.57" y="0.49" width="21.04" height="21.04" rx="3.6" ry="3.6"/><rect class="cls-4" x="8.33" y="1.26" width="5.5" height="9" rx="2.5" ry="2.5"/><rect class="cls-5" x="8.33" y="11.76" width="5.5" height="9" rx="2.5" ry="2.5"/><rect class="cls-6" x="3.21" y="6.55" width="5.5" height="9" rx="2.5" ry="2.5" transform="translate(-5.09 17) rotate(-90)"/><rect class="cls-7" x="13.48" y="6.55" width="5.5" height="9" rx="2.5" ry="2.5" transform="translate(5.18 27.28) rotate(-90)"/><rect class="cls-8" x="11.87" y="3.03" width="5.5" height="9" rx="2.5" ry="2.5" transform="translate(19.64 23.19) rotate(-135)"/><rect class="cls-9" x="4.8" y="10.14" width="5.5" height="9" rx="2.5" ry="2.5" transform="translate(2.54 30.33) rotate(-135)"/><rect class="cls-10" x="4.83" y="3.03" width="5.5" height="9" rx="2.5" ry="2.5" transform="translate(-3.1 7.56) rotate(-45)"/><rect class="cls-11" x="11.87" y="10.14" width="5.5" height="9" rx="2.5" ry="2.5" transform="translate(-6.07 14.63) rotate(-45)"/></g></g></svg>');
}
&.icon-text-valign-top {
width: 22px;
height: 22px;
......@@ -286,4 +292,12 @@ i.icon {
height: 28px;
.encoded-svg-background('<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 28 28" fill="@{themeColor}"><g><path opacity="0.3" d="M1,1V13H13V1H1ZM12,12H2V2H12V12Z"/><path opacity="0.3" d="M15,15V27H27V15H15ZM26,26H16V16H26V26Z"/><rect x="8" y="8" width="13" height="13"/></g></svg>');
}
// Formats
&.icon-format-pdf {
width: 28px;
height: 28px;
.encoded-svg-background('<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 28 28"><defs><style>.cls-1{fill:#a83a30;}.cls-2{fill:#f6f6f6;}.cls-3{fill:#7f2e27;}</style></defs><path class="cls-1" d="M18,1H5A1,1,0,0,0,4,2V26a1,1,0,0,0,1,1H23a1,1,0,0,0,1-1V7Z"/><path class="cls-2" d="M16.75,17a9,9,0,0,1-1.2-.79,7.18,7.18,0,0,1-2-3.25,17.46,17.46,0,0,0,.2-2.9c-0.09.44-.16,1.17-0.4,2.21a6,6,0,0,1-.19-2.91,0.81,0.81,0,0,1,.19-0.3,0.89,0.89,0,0,1,.44.76C14,9,13.54,9,13.43,9H13.17a0.39,0.39,0,0,0-.33.35A7.56,7.56,0,0,0,13.16,13a20.42,20.42,0,0,1-1.39,3.53c-1.69,3.4-3,5.12-3.86,5.12-0.06-.45.83-1.69,2.05-2.6-2.06,1.09-2.49,2.34-2.3,2.58L8,21.81c0.6,0.31,1.63-.51,3.24-3.29a23.72,23.72,0,0,1,5.32-1.13c1.73,0.93,3.72,1.25,3.82.65-0.45.21-1.73-.09-3-0.71,1.78-.11,3.12,0,3.09.58C20.84,17,19.11,16.75,16.75,17ZM11.24,18.5c0.28-.49.58-1,0.9-1.65a14.64,14.64,0,0,0,1.25-3.14,7,7,0,0,0,1.83,2.81,6.78,6.78,0,0,0,.83.6A19.7,19.7,0,0,0,11.24,18.5Z"/><path class="cls-3" d="M18,1V6a1,1,0,0,0,1,1h5Z"/></svg>');
}
}
\ No newline at end of file
apps/presentationeditor/mobile/resources/less/material/_icons.less
View file @ eab5a97e
......@@ -165,6 +165,12 @@ i.icon {
height: 22px;
.encoded-svg-background('<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 22 22" fill="@{themeColor}"><g><path d="M12.4,9.8c0,0-2.1-0.1-3.8,1.2c-2.8,2-3.3,4.3-3.3,4.3s1.6-1.7,3.5-2.5c1.7-0.7,3.7-0.4,3.7-0.4v1.9l4.8-3.3V11l-4.8-3.3V9.8z M11,1C5.5,1,1,5.5,1,11c0,5.5,4.5,10,10,10s10-4.5,10-10C21,5.5,16.5,1,11,1z M11,20c-5,0-9-4.1-9-9C2,6,6,2,11,2s9,4.1,9,9C20,16,16,20,11,20z"/></g></svg>');
}
&.icon-image-library {
width: 22px;
height: 22px;
.encoded-svg-background('<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 22 22"><defs><style>.cls-1{isolation:isolate;}.cls-2{opacity:0.2;}.cls-3{fill:#fff;}.cls-10,.cls-11,.cls-4,.cls-6,.cls-7,.cls-8,.cls-9{mix-blend-mode:multiply;}.cls-4{fill:url(#grad_8);}.cls-5{fill:url(#grad_10);}.cls-6{fill:url(#grad_12);}.cls-7{fill:url(#grad_14);}.cls-8{fill:url(#grad_79);}.cls-9{fill:url(#grad_77);}.cls-10{fill:url(#grad_75);}.cls-11{fill:url(#grad_81);}</style><linearGradient id="grad_8" x1="11.08" y1="10.26" x2="11.08" y2="1.26" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#f3e916"/><stop offset="1" stop-color="#f89d34"/></linearGradient><linearGradient id="grad_10" x1="11.08" y1="20.44" x2="11.08" y2="11.88" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#5eb6e8"/><stop offset="1" stop-color="#958cc3"/></linearGradient><linearGradient id="grad_12" x1="1.46" y1="11.05" x2="10.46" y2="11.05" gradientTransform="translate(17 5.09) rotate(90)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#cc8dba"/><stop offset="1" stop-color="#f86867"/></linearGradient><linearGradient id="grad_14" x1="11.73" y1="11.05" x2="20.73" y2="11.05" gradientTransform="translate(27.28 -5.18) rotate(90)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#6ac07f"/><stop offset="1" stop-color="#c5da3d"/></linearGradient><linearGradient id="grad_79" x1="11.74" y1="10.42" x2="17.52" y2="4.63" gradientTransform="translate(30.29 2.51) rotate(135)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#c5da3d"/><stop offset="1" stop-color="#f3e916"/></linearGradient><linearGradient id="grad_77" x1="4.7" y1="17.49" x2="10.48" y2="11.71" gradientTransform="translate(23.24 19.65) rotate(135)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#9595c3"/><stop offset="1" stop-color="#cc8dba"/></linearGradient><linearGradient id="grad_75" x1="4.69" y1="4.64" x2="10.47" y2="10.42" gradientTransform="translate(7.54 -3.15) rotate(45)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#f86867"/><stop offset="1" stop-color="#f89d34"/></linearGradient><linearGradient id="grad_81" x1="11.77" y1="11.78" x2="17.55" y2="17.56" gradientTransform="translate(14.63 -6.05) rotate(45)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#5ec0e8"/><stop offset="1" stop-color="#6ac07f"/></linearGradient></defs><title>icons_for_svg</title><g class="cls-1"><g id="Слой_1" data-name="Слой 1"><rect class="cls-2" x="0.09" y="0.01" width="22" height="22" rx="4" ry="4"/><rect class="cls-3" x="0.57" y="0.49" width="21.04" height="21.04" rx="3.6" ry="3.6"/><rect class="cls-4" x="8.33" y="1.26" width="5.5" height="9" rx="2.5" ry="2.5"/><rect class="cls-5" x="8.33" y="11.76" width="5.5" height="9" rx="2.5" ry="2.5"/><rect class="cls-6" x="3.21" y="6.55" width="5.5" height="9" rx="2.5" ry="2.5" transform="translate(-5.09 17) rotate(-90)"/><rect class="cls-7" x="13.48" y="6.55" width="5.5" height="9" rx="2.5" ry="2.5" transform="translate(5.18 27.28) rotate(-90)"/><rect class="cls-8" x="11.87" y="3.03" width="5.5" height="9" rx="2.5" ry="2.5" transform="translate(19.64 23.19) rotate(-135)"/><rect class="cls-9" x="4.8" y="10.14" width="5.5" height="9" rx="2.5" ry="2.5" transform="translate(2.54 30.33) rotate(-135)"/><rect class="cls-10" x="4.83" y="3.03" width="5.5" height="9" rx="2.5" ry="2.5" transform="translate(-3.1 7.56) rotate(-45)"/><rect class="cls-11" x="11.87" y="10.14" width="5.5" height="9" rx="2.5" ry="2.5" transform="translate(-6.07 14.63) rotate(-45)"/></g></g></svg>');
}
&.icon-text-valign-top {
width: 22px;
height: 22px;
......@@ -256,6 +262,14 @@ i.icon {
height: 28px;
.encoded-svg-background('<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 28 28" fill="@{themeColor}"><g><path opacity="0.3" d="M1,1V13H13V1H1ZM12,12H2V2H12V12Z"/><path opacity="0.3" d="M15,15V27H27V15H15ZM26,26H16V16H26V26Z"/><rect x="8" y="8" width="13" height="13"/></g></svg>');
}
// Formats
&.icon-format-pdf {
width: 28px;
height: 28px;
.encoded-svg-background('<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 28 28"><defs><style>.cls-1{fill:#a83a30;}.cls-2{fill:#f6f6f6;}.cls-3{fill:#7f2e27;}</style></defs><path class="cls-1" d="M18,1H5A1,1,0,0,0,4,2V26a1,1,0,0,0,1,1H23a1,1,0,0,0,1-1V7Z"/><path class="cls-2" d="M16.75,17a9,9,0,0,1-1.2-.79,7.18,7.18,0,0,1-2-3.25,17.46,17.46,0,0,0,.2-2.9c-0.09.44-.16,1.17-0.4,2.21a6,6,0,0,1-.19-2.91,0.81,0.81,0,0,1,.19-0.3,0.89,0.89,0,0,1,.44.76C14,9,13.54,9,13.43,9H13.17a0.39,0.39,0,0,0-.33.35A7.56,7.56,0,0,0,13.16,13a20.42,20.42,0,0,1-1.39,3.53c-1.69,3.4-3,5.12-3.86,5.12-0.06-.45.83-1.69,2.05-2.6-2.06,1.09-2.49,2.34-2.3,2.58L8,21.81c0.6,0.31,1.63-.51,3.24-3.29a23.72,23.72,0,0,1,5.32-1.13c1.73,0.93,3.72,1.25,3.82.65-0.45.21-1.73-.09-3-0.71,1.78-.11,3.12,0,3.09.58C20.84,17,19.11,16.75,16.75,17ZM11.24,18.5c0.28-.49.58-1,0.9-1.65a14.64,14.64,0,0,0,1.25-3.14,7,7,0,0,0,1.83,2.81,6.78,6.78,0,0,0,.83.6A19.7,19.7,0,0,0,11.24,18.5Z"/><path class="cls-3" d="M18,1V6a1,1,0,0,0,1,1h5Z"/></svg>');
}
}
// Overwrite color for toolbar
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7