From 9415bc03de81c0f95706bca11f904911f9286b57 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 21 Jun 2018 16:31:21 +0300 Subject: [PATCH] Fix Bug 37714 --- .../mobile/app/controller/edit/EditShape.js | 5 ++- .../mobile/app/template/EditShape.template | 41 +++++++++++++++++++ .../mobile/app/view/edit/EditShape.js | 6 ++- .../mobile/app/controller/edit/EditShape.js | 5 ++- .../mobile/app/template/EditShape.template | 41 +++++++++++++++++++ .../mobile/app/view/edit/EditShape.js | 6 ++- .../mobile/app/controller/edit/EditShape.js | 5 ++- .../mobile/app/template/EditShape.template | 41 +++++++++++++++++++ .../mobile/app/view/edit/EditShape.js | 7 ++++ 9 files changed, 152 insertions(+), 5 deletions(-) diff --git a/apps/documenteditor/mobile/app/controller/edit/EditShape.js b/apps/documenteditor/mobile/app/controller/edit/EditShape.js index 91736f1f5..500c620f2 100644 --- a/apps/documenteditor/mobile/app/controller/edit/EditShape.js +++ b/apps/documenteditor/mobile/app/controller/edit/EditShape.js @@ -175,8 +175,10 @@ define([ if (_shapeObject) { if (pageId == '#edit-shape-wrap') { me._initWrapView(); - } else if (pageId == '#edit-shape-style' || pageId == '#edit-shape-border-color-view') { + } else if (pageId == '#edit-shape-style' || pageId == '#edit-shape-style-nofill' || pageId == '#edit-shape-border-color-view') { me._initStyleView(); + } else { + me.getView('EditShape').isShapeCanFill = _shapeObject.get_ShapeProperties().get_CanFill(); } } }, @@ -534,6 +536,7 @@ define([ if (shapes.length > 0) { var object = shapes[shapes.length - 1]; // get top shape _shapeObject = object.get_ObjectValue(); + this.getView('EditShape').isShapeCanFill = _shapeObject.get_ShapeProperties().get_CanFill(); } else { _shapeObject = undefined; } diff --git a/apps/documenteditor/mobile/app/template/EditShape.template b/apps/documenteditor/mobile/app/template/EditShape.template index 144ced831..f9bb94f59 100644 --- a/apps/documenteditor/mobile/app/template/EditShape.template +++ b/apps/documenteditor/mobile/app/template/EditShape.template @@ -393,6 +393,47 @@ +
+
+
+
<% if (!android) { %><%= scope.textBack %><% } %>
+
<%= scope.textBorder %>
+
<% if (phone) { %><% } %>
+
+
+
+
+
+ +
+
+
+
+
diff --git a/apps/documenteditor/mobile/app/view/edit/EditShape.js b/apps/documenteditor/mobile/app/view/edit/EditShape.js index fd12d7970..3e430abeb 100644 --- a/apps/documenteditor/mobile/app/view/edit/EditShape.js +++ b/apps/documenteditor/mobile/app/view/edit/EditShape.js @@ -62,6 +62,7 @@ define([ initialize: function () { Common.NotificationCenter.on('editcontainer:show', _.bind(this.initEvents, this)); Common.NotificationCenter.on('editcategory:show', _.bind(this.categoryShow, this)); + this.isShapeCanFill = true; }, initEvents: function () { @@ -142,9 +143,12 @@ define([ }, showStyle: function () { - var selector = '#edit-shape-style'; + var selector = this.isShapeCanFill ? '#edit-shape-style' : '#edit-shape-style-nofill'; this.showPage(selector, true); + if (!this.isShapeCanFill) + this.showStyleCategory(); + this.paletteFillColor = new Common.UI.ThemeColorPalette({ el: $('#tab-shape-fill'), transparent: true diff --git a/apps/presentationeditor/mobile/app/controller/edit/EditShape.js b/apps/presentationeditor/mobile/app/controller/edit/EditShape.js index f088f8ab6..37fc11849 100644 --- a/apps/presentationeditor/mobile/app/controller/edit/EditShape.js +++ b/apps/presentationeditor/mobile/app/controller/edit/EditShape.js @@ -140,8 +140,10 @@ define([ // me.api && me.api.UpdateInterfaceState(); if (_shapeObject) { - if (pageId == '#edit-shape-style' || pageId == '#edit-shape-border-color-view') { + if (pageId == '#edit-shape-style' || pageId == '#edit-shape-style-nofill' || pageId == '#edit-shape-border-color-view') { me._initStyleView(); + } else { + me.getView('EditShape').isShapeCanFill = _shapeObject.get_CanFill(); } } }, @@ -386,6 +388,7 @@ define([ if (shapes.length > 0) { var object = shapes[shapes.length - 1]; // get top shape _shapeObject = object.get_ObjectValue(); + this.getView('EditShape').isShapeCanFill = _shapeObject.get_CanFill(); } else { _shapeObject = undefined; } diff --git a/apps/presentationeditor/mobile/app/template/EditShape.template b/apps/presentationeditor/mobile/app/template/EditShape.template index 8b43d106d..16ed68947 100644 --- a/apps/presentationeditor/mobile/app/template/EditShape.template +++ b/apps/presentationeditor/mobile/app/template/EditShape.template @@ -220,6 +220,47 @@
+
+
+
+
<% if (!android) { %><%= scope.textBack %><% } %>
+
<%= scope.textBorder %>
+
<% if (phone) { %><% } %>
+
+
+
+
+
+ +
+
+
+
+
diff --git a/apps/presentationeditor/mobile/app/view/edit/EditShape.js b/apps/presentationeditor/mobile/app/view/edit/EditShape.js index 8301bfafe..89c527e55 100644 --- a/apps/presentationeditor/mobile/app/view/edit/EditShape.js +++ b/apps/presentationeditor/mobile/app/view/edit/EditShape.js @@ -62,6 +62,7 @@ define([ initialize: function () { Common.NotificationCenter.on('editcontainer:show', _.bind(this.initEvents, this)); Common.NotificationCenter.on('editcategory:show', _.bind(this.categoryShow, this)); + this.isShapeCanFill = true; }, initEvents: function () { @@ -142,9 +143,12 @@ define([ }, showStyle: function () { - var selector = '#edit-shape-style'; + var selector = this.isShapeCanFill ? '#edit-shape-style' : '#edit-shape-style-nofill'; this.showPage(selector, true); + if (!this.isShapeCanFill) + this.showStyleCategory(); + this.paletteFillColor = new Common.UI.ThemeColorPalette({ el: $('#tab-shape-fill'), transparent: true diff --git a/apps/spreadsheeteditor/mobile/app/controller/edit/EditShape.js b/apps/spreadsheeteditor/mobile/app/controller/edit/EditShape.js index 210ed7838..c7a689ee2 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/edit/EditShape.js +++ b/apps/spreadsheeteditor/mobile/app/controller/edit/EditShape.js @@ -136,7 +136,7 @@ define([ var me = this; - if ('#edit-shape-style' == pageId) { + if ('#edit-shape-style' == pageId || '#edit-shape-style-nofill' == pageId ) { me.initStylePage(); } else if ('#edit-shape-border-color-view' == pageId) { me.initBorderColorPage(); @@ -151,6 +151,7 @@ define([ initRootPage: function () { $('#shape-remove').single('click', _.bind(this.onRemoveShape, this)); + this.getView('EditShape').isShapeCanFill = _shapeObject.get_ShapeProperties().asc_getCanFill(); }, initStylePage: function () { @@ -423,6 +424,8 @@ define([ }; _shapeObject = getTopObject(shapes); + if (_shapeObject) + this.getView('EditShape').isShapeCanFill = _shapeObject.get_ShapeProperties().asc_getCanFill(); }, // Helpers diff --git a/apps/spreadsheeteditor/mobile/app/template/EditShape.template b/apps/spreadsheeteditor/mobile/app/template/EditShape.template index c8605dd42..c99a04526 100644 --- a/apps/spreadsheeteditor/mobile/app/template/EditShape.template +++ b/apps/spreadsheeteditor/mobile/app/template/EditShape.template @@ -211,6 +211,47 @@
+
+
+
+
<% if (!android) { %><%= scope.textBack %><% } %>
+
<%= scope.textBorder %>
+
<% if (phone) { %><% } %>
+
+
+
+
+
+ +
+
+
+
+
diff --git a/apps/spreadsheeteditor/mobile/app/view/edit/EditShape.js b/apps/spreadsheeteditor/mobile/app/view/edit/EditShape.js index 2afde9a7b..87aa92468 100644 --- a/apps/spreadsheeteditor/mobile/app/view/edit/EditShape.js +++ b/apps/spreadsheeteditor/mobile/app/view/edit/EditShape.js @@ -62,6 +62,7 @@ define([ Common.NotificationCenter.on('editcontainer:show', _.bind(this.initEvents, this)); Common.NotificationCenter.on('editcategory:show', _.bind(this.categoryShow, this)); this.on('page:show', _.bind(this.updateItemHandlers, this)); + this.isShapeCanFill = true; }, initEvents: function () { @@ -153,7 +154,13 @@ define([ page = $target.data('page'); if (page && page.length > 0 ) { + if (page == '#edit-shape-style' && !this.isShapeCanFill) + page = '#edit-shape-style-nofill'; + this.showPage(page); + + if (!this.isShapeCanFill) + this.showStyleCategory(); } },