From 9012784170a2ed7798b732ad721a02267e22ad36 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 18 Jul 2019 11:37:34 +0300 Subject: [PATCH 1/3] [PE] Load default styles from image --- .../main/app/controller/Toolbar.js | 47 ++++++++++++++----- .../main/app/view/DocumentHolder.js | 2 +- .../main/app/view/Toolbar.js | 4 +- .../main/resources/less/toolbar.less | 8 ++++ 4 files changed, 47 insertions(+), 14 deletions(-) diff --git a/apps/presentationeditor/main/app/controller/Toolbar.js b/apps/presentationeditor/main/app/controller/Toolbar.js index 2692b5750..2024b51fa 100644 --- a/apps/presentationeditor/main/app/controller/Toolbar.js +++ b/apps/presentationeditor/main/app/controller/Toolbar.js @@ -1960,26 +1960,51 @@ define([ me.toolbar.listTheme.menuPicker.store.reset([]); // remove all var themeStore = this.getCollection('SlideThemes'), - mainController = this.getApplication().getController('Main'); + mainController = this.getApplication().getController('Main'), + imageUrl = (window.devicePixelRatio > 1) ? '../../../../sdkjs/common/Images/fonts_thumbnail@2x.png' : '../../../../sdkjs/common/Images/fonts_thumbnail.png'; if (themeStore) { - var arr = []; - _.each(defaultThemes.concat(docThemes), function(theme) { - arr.push(new Common.UI.DataViewModel({ - imageUrl: theme.get_Image(), + var arr1 = [], arr2 = []; + _.each(defaultThemes, function(theme, index) { + var tip = mainController.translationTable[theme.get_Name()] || theme.get_Name(); + arr1.push(new Common.UI.DataViewModel({ + imageUrl: imageUrl, uid : Common.UI.getId(), themeId : theme.get_Index(), - tip : mainController.translationTable[theme.get_Name()] || theme.get_Name(), + tip : tip, itemWidth : 85, - itemHeight : 38 + itemHeight : 38, + offsety : index * 38 })); - me.toolbar.listTheme.menuPicker.store.add({ - imageUrl: theme.get_Image(), + arr2.push({ + imageUrl: imageUrl, uid : Common.UI.getId(), themeId : theme.get_Index(), - tip : mainController.translationTable[theme.get_Name()] || theme.get_Name() + tip : tip, + offsety : index * 38 }); }); - themeStore.reset(arr); + _.each(docThemes, function(theme) { + var image = theme.get_Image(), + tip = mainController.translationTable[theme.get_Name()] || theme.get_Name(); + arr1.push(new Common.UI.DataViewModel({ + imageUrl: image, + uid : Common.UI.getId(), + themeId : theme.get_Index(), + tip : tip, + itemWidth : 85, + itemHeight : 38, + offsety : 0 + })); + arr2.push({ + imageUrl: image, + uid : Common.UI.getId(), + themeId : theme.get_Index(), + tip : tip, + offsety : 0 + }); + }); + themeStore.reset(arr1); + me.toolbar.listTheme.menuPicker.store.reset(arr2); } if (me.toolbar.listTheme.menuPicker.store.length > 0 && me.toolbar.listTheme.rendered){ diff --git a/apps/presentationeditor/main/app/view/DocumentHolder.js b/apps/presentationeditor/main/app/view/DocumentHolder.js index 8b66850f8..dc2a87364 100644 --- a/apps/presentationeditor/main/app/view/DocumentHolder.js +++ b/apps/presentationeditor/main/app/view/DocumentHolder.js @@ -2032,7 +2032,7 @@ define([ store : PE.getCollection('SlideThemes'), itemTemplate: _.template([ '
', - '
', + '
', '
' ].join('')) }).on('item:click', function(picker, item, record, e) { diff --git a/apps/presentationeditor/main/app/view/Toolbar.js b/apps/presentationeditor/main/app/view/Toolbar.js index 836eb8822..f3fd39f7c 100644 --- a/apps/presentationeditor/main/app/view/Toolbar.js +++ b/apps/presentationeditor/main/app/view/Toolbar.js @@ -804,12 +804,12 @@ define([ me.listTheme.fieldPicker.itemTemplate = _.template([ '
', - '
', + '
', '
' ].join('')); me.listTheme.menuPicker.itemTemplate = _.template([ '
', - '
', + '
', '
' ].join('')); diff --git a/apps/presentationeditor/main/resources/less/toolbar.less b/apps/presentationeditor/main/resources/less/toolbar.less index 2ac1e08e4..e947c0e89 100644 --- a/apps/presentationeditor/main/resources/less/toolbar.less +++ b/apps/presentationeditor/main/resources/less/toolbar.less @@ -332,4 +332,12 @@ z-index: @zindex-dropdown - 20; background-color: @gray-light; border: 1px solid @gray; +} + +.combo-styles { + .style { + > div { + background-size: auto; + } + } } \ No newline at end of file From 469893845fd1a712de7febf3495122a91c446ee1 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 22 Jul 2019 15:54:20 +0300 Subject: [PATCH 2/3] [PE] Change path to style images --- apps/presentationeditor/main/app/controller/Toolbar.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/presentationeditor/main/app/controller/Toolbar.js b/apps/presentationeditor/main/app/controller/Toolbar.js index 2024b51fa..19814335d 100644 --- a/apps/presentationeditor/main/app/controller/Toolbar.js +++ b/apps/presentationeditor/main/app/controller/Toolbar.js @@ -1961,7 +1961,7 @@ define([ var themeStore = this.getCollection('SlideThemes'), mainController = this.getApplication().getController('Main'), - imageUrl = (window.devicePixelRatio > 1) ? '../../../../sdkjs/common/Images/fonts_thumbnail@2x.png' : '../../../../sdkjs/common/Images/fonts_thumbnail.png'; + imageUrl = (window.devicePixelRatio > 1) ? '../../../../sdkjs/common/Images/themes_thumbnail@2x.png' : '../../../../sdkjs/common/Images/themes_thumbnail.png'; if (themeStore) { var arr1 = [], arr2 = []; _.each(defaultThemes, function(theme, index) { From d4cc5df5bc9d789db06ce860aa18be72a43b99e9 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 23 Jul 2019 10:21:00 +0300 Subject: [PATCH 3/3] [PE] Fix rendering themes --- apps/presentationeditor/main/app/view/DocumentHolder.js | 2 +- apps/presentationeditor/main/resources/less/toolbar.less | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/apps/presentationeditor/main/app/view/DocumentHolder.js b/apps/presentationeditor/main/app/view/DocumentHolder.js index dc2a87364..076d779fc 100644 --- a/apps/presentationeditor/main/app/view/DocumentHolder.js +++ b/apps/presentationeditor/main/app/view/DocumentHolder.js @@ -2032,7 +2032,7 @@ define([ store : PE.getCollection('SlideThemes'), itemTemplate: _.template([ '
', - '
', + '
', '
' ].join('')) }).on('item:click', function(picker, item, record, e) { diff --git a/apps/presentationeditor/main/resources/less/toolbar.less b/apps/presentationeditor/main/resources/less/toolbar.less index e947c0e89..2ac1e08e4 100644 --- a/apps/presentationeditor/main/resources/less/toolbar.less +++ b/apps/presentationeditor/main/resources/less/toolbar.less @@ -332,12 +332,4 @@ z-index: @zindex-dropdown - 20; background-color: @gray-light; border: 1px solid @gray; -} - -.combo-styles { - .style { - > div { - background-size: auto; - } - } } \ No newline at end of file