Commit a01ec32e authored by Alexander.Trofimov's avatar Alexander.Trofimov

FONT_THUMBNAIL_HEIGHT -> Asc.FONT_THUMBNAIL_HEIGHT

shd_Clear -> Asc.c_oAscShdClear
shd_Nil -> Asc.c_oAscShdNil
parent 22967992
......@@ -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;
......
......@@ -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) {
......
......@@ -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) {
......
......@@ -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) {
......
......@@ -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));
}
}
......
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