From a01ec32edb34e5fa0e440a1be0c03f14bfeec1d7 Mon Sep 17 00:00:00 2001 From: "Alexander.Trofimov" Date: Tue, 5 Apr 2016 19:18:57 +0300 Subject: [PATCH] FONT_THUMBNAIL_HEIGHT -> Asc.FONT_THUMBNAIL_HEIGHT shd_Clear -> Asc.c_oAscShdClear shd_Nil -> Asc.c_oAscShdNil --- apps/common/main/lib/component/ComboBoxFonts.js | 10 +++++----- apps/documenteditor/main/app/controller/Toolbar.js | 2 +- .../main/app/view/DropcapSettingsAdvanced.js | 6 +++--- apps/documenteditor/main/app/view/ParagraphSettings.js | 2 +- .../main/app/view/ParagraphSettingsAdvanced.js | 6 +++--- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/apps/common/main/lib/component/ComboBoxFonts.js b/apps/common/main/lib/component/ComboBoxFonts.js index 59f30b1b3..f27ee50e0 100644 --- a/apps/common/main/lib/component/ComboBoxFonts.js +++ b/apps/common/main/lib/component/ComboBoxFonts.js @@ -50,7 +50,7 @@ define([ Common.UI.ComboBoxFonts = Common.UI.ComboBox.extend((function() { var iconWidth = 302, - iconHeight = FONT_THUMBNAIL_HEIGHT || 26, + iconHeight = Asc.FONT_THUMBNAIL_HEIGHT || 26, isRetina = window.devicePixelRatio > 1, thumbCanvas = document.createElement('canvas'), thumbContext = thumbCanvas.getContext('2d'), @@ -259,10 +259,10 @@ define([ if (isRetina) { thumbContext.clearRect(0, 0, iconWidth * 2, iconHeight * 2); - thumbContext.drawImage(this.spriteThumbs, 0, -FONT_THUMBNAIL_HEIGHT * 2 * opts.imgidx); + thumbContext.drawImage(this.spriteThumbs, 0, -Asc.FONT_THUMBNAIL_HEIGHT * 2 * opts.imgidx); } else { thumbContext.clearRect(0, 0, iconWidth, iconHeight); - thumbContext.drawImage(this.spriteThumbs, 0, -FONT_THUMBNAIL_HEIGHT * opts.imgidx); + thumbContext.drawImage(this.spriteThumbs, 0, -Asc.FONT_THUMBNAIL_HEIGHT * opts.imgidx); } return thumbCanvas.toDataURL(); @@ -474,10 +474,10 @@ define([ if (isRetina) { context.clearRect(0, 0, iconWidth * 2, iconHeight * 2); - context.drawImage(me.spriteThumbs, 0, -FONT_THUMBNAIL_HEIGHT * 2 * index); + context.drawImage(me.spriteThumbs, 0, -Asc.FONT_THUMBNAIL_HEIGHT * 2 * index); } else { context.clearRect(0, 0, iconWidth, iconHeight); - context.drawImage(me.spriteThumbs, 0, -FONT_THUMBNAIL_HEIGHT * index); + context.drawImage(me.spriteThumbs, 0, -Asc.FONT_THUMBNAIL_HEIGHT * index); } me.tiles[j] = fontImage; diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js index 16c04eb69..a5977a564 100644 --- a/apps/documenteditor/main/app/controller/Toolbar.js +++ b/apps/documenteditor/main/app/controller/Toolbar.js @@ -2068,7 +2068,7 @@ define([ onParagraphColor: function(shd) { var picker = this.toolbar.mnuParagraphColorPicker, clr; - if (shd!==null && shd!==undefined && shd.get_Value()===shd_Clear) { + if (shd!==null && shd!==undefined && shd.get_Value()===Asc.c_oAscShdClear) { var color = shd.get_Color(); if (color) { if (color.get_type() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) { diff --git a/apps/documenteditor/main/app/view/DropcapSettingsAdvanced.js b/apps/documenteditor/main/app/view/DropcapSettingsAdvanced.js index 7424cc679..ad27d3a7c 100644 --- a/apps/documenteditor/main/app/view/DropcapSettingsAdvanced.js +++ b/apps/documenteditor/main/app/view/DropcapSettingsAdvanced.js @@ -247,9 +247,9 @@ define([ me._changedProps.put_Shade(new CParagraphShd()); } if (color=='transparent') { - me._changedProps.get_Shade().put_Value(shd_Nil); + me._changedProps.get_Shade().put_Value(Asc.c_oAscShdNil); } else { - me._changedProps.get_Shade().put_Value(shd_Clear); + me._changedProps.get_Shade().put_Value(Asc.c_oAscShdClear); me._changedProps.get_Shade().put_Color(Common.Utils.ThemeColor.getRgbColor(color)); } } @@ -972,7 +972,7 @@ define([ } var shd = frame_props.get_Shade(); - if (shd!==null && shd!==undefined && shd.get_Value()===shd_Clear) { + if (shd!==null && shd!==undefined && shd.get_Value()===Asc.c_oAscShdClear) { var color = shd.get_Color(); if (color) { if (color.get_type() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) { diff --git a/apps/documenteditor/main/app/view/ParagraphSettings.js b/apps/documenteditor/main/app/view/ParagraphSettings.js index 8d7544400..d578be183 100644 --- a/apps/documenteditor/main/app/view/ParagraphSettings.js +++ b/apps/documenteditor/main/app/view/ParagraphSettings.js @@ -364,7 +364,7 @@ define([ } var shd = prop.get_Shade(); - if (shd!==null && shd!==undefined && shd.get_Value()===shd_Clear) { + if (shd!==null && shd!==undefined && shd.get_Value()===Asc.c_oAscShdClear) { var color = shd.get_Color(); if (color) { if (color.get_type() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) { diff --git a/apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js b/apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js index f8671be05..b3308ff3e 100644 --- a/apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js +++ b/apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js @@ -641,7 +641,7 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem // Borders var shd = props.get_Shade(); - if (shd!==null && shd!==undefined && shd.get_Value()===shd_Clear) { + if (shd!==null && shd!==undefined && shd.get_Value()===Asc.c_oAscShdClear) { var color = shd.get_Color(); if (color) { if (color.get_type() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) { @@ -913,9 +913,9 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem this._changedProps.put_Shade(new CParagraphShd()); } if (this.paragraphShade=='transparent') { - this._changedProps.get_Shade().put_Value(shd_Nil); + this._changedProps.get_Shade().put_Value(Asc.c_oAscShdNil); } else { - this._changedProps.get_Shade().put_Value(shd_Clear); + this._changedProps.get_Shade().put_Value(Asc.c_oAscShdClear); this._changedProps.get_Shade().put_Color(Common.Utils.ThemeColor.getRgbColor(this.paragraphShade)); } }