Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

FONT_THUMBNAIL_HEIGHT -> Asc.FONT_THUMBNAIL_HEIGHT

Browse source 
shd_Clear -> Asc.c_oAscShdClear
shd_Nil -> Asc.c_oAscShdNil
This commit is contained in:
Alexander.Trofimov 2016-04-05 19:18:57 +03:00
parent 229679925d
commit a01ec32edb
5 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
apps/common/main/lib/component/ComboBoxFonts.js
View file

@ -50,7 +50,7 @@ define([
Common.UI.ComboBoxFonts = Common.UI.ComboBox.extend((function() { Common.UI.ComboBoxFonts = Common.UI.ComboBox.extend((function() {
var iconWidth = 302, var iconWidth = 302,
iconHeight = FONT_THUMBNAIL_HEIGHT || 26, iconHeight = Asc.FONT_THUMBNAIL_HEIGHT || 26,
isRetina = window.devicePixelRatio > 1, isRetina = window.devicePixelRatio > 1,
thumbCanvas = document.createElement('canvas'), thumbCanvas = document.createElement('canvas'),
thumbContext = thumbCanvas.getContext('2d'), thumbContext = thumbCanvas.getContext('2d'),
@ -259,10 +259,10 @@ define([
if (isRetina) { if (isRetina) {
thumbContext.clearRect(0, 0, iconWidth * 2, iconHeight * 2); 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 { } else {
thumbContext.clearRect(0, 0, iconWidth, iconHeight); 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(); return thumbCanvas.toDataURL();
@ -474,10 +474,10 @@ define([
if (isRetina) { if (isRetina) {
context.clearRect(0, 0, iconWidth * 2, iconHeight * 2); 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 { } else {
context.clearRect(0, 0, iconWidth, iconHeight); 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; me.tiles[j] = fontImage;

2
apps/documenteditor/main/app/controller/Toolbar.js
View file

@ -2068,7 +2068,7 @@ define([
onParagraphColor: function(shd) { onParagraphColor: function(shd) {
var picker = this.toolbar.mnuParagraphColorPicker, clr; 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(); var color = shd.get_Color();
if (color) { if (color) {
if (color.get_type() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) { if (color.get_type() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) {

6
apps/documenteditor/main/app/view/DropcapSettingsAdvanced.js
View file

@ -247,9 +247,9 @@ define([
me._changedProps.put_Shade(new CParagraphShd()); me._changedProps.put_Shade(new CParagraphShd());
} }
if (color=='transparent') { if (color=='transparent') {
me._changedProps.get_Shade().put_Value(shd_Nil); me._changedProps.get_Shade().put_Value(Asc.c_oAscShdNil);
} else { } 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)); me._changedProps.get_Shade().put_Color(Common.Utils.ThemeColor.getRgbColor(color));
} }
} }
@ -972,7 +972,7 @@ define([
} }
var shd = frame_props.get_Shade(); 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(); var color = shd.get_Color();
if (color) { if (color) {
if (color.get_type() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) { if (color.get_type() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) {

2
apps/documenteditor/main/app/view/ParagraphSettings.js
View file

@ -364,7 +364,7 @@ define([
} }
var shd = prop.get_Shade(); 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(); var color = shd.get_Color();
if (color) { if (color) {
if (color.get_type() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) { if (color.get_type() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) {

6
apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js
View file

@ -641,7 +641,7 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
// Borders // Borders
var shd = props.get_Shade(); 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(); var color = shd.get_Color();
if (color) { if (color) {
if (color.get_type() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) { 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()); this._changedProps.put_Shade(new CParagraphShd());
} }
if (this.paragraphShade=='transparent') { if (this.paragraphShade=='transparent') {
this._changedProps.get_Shade().put_Value(shd_Nil); this._changedProps.get_Shade().put_Value(Asc.c_oAscShdNil);
} else { } 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)); this._changedProps.get_Shade().put_Color(Common.Utils.ThemeColor.getRgbColor(this.paragraphShade));
} }
} }