Commit 2bea4900 authored by Oleg Korshul's avatar Oleg Korshul

worked version

parent e16598f1
...@@ -4,10 +4,10 @@ call npm install ...@@ -4,10 +4,10 @@ call npm install
rem call grunt --level=WHITESPACE_ONLY --mobile=true --formatting=PRETTY_PRINT rem call grunt --level=WHITESPACE_ONLY --mobile=true --formatting=PRETTY_PRINT
call grunt --level=ADVANCED --mobile=true call grunt --level=ADVANCED --mobile=true
copy /b ..\word\sdk-all-min.js + ..\word\sdk-all.js ..\..\core\build\jsnative\word\script.bin copy /b/y ..\word\sdk-all-min.js + ..\word\sdk-all.js ..\..\core\build\jsnative\word\script.bin
copy /b ..\cell\sdk-all-min.js + ..\cell\sdk-all.js ..\..\core\build\jsnative\cell\script.bin copy /b/y ..\cell\sdk-all-min.js + ..\cell\sdk-all.js ..\..\core\build\jsnative\cell\script.bin
copy /b ..\slide\sdk-all-min.js + ..\slide\sdk-all.js ..\..\core\build\jsnative\slide\script.bin copy /b/y ..\slide\sdk-all-min.js + ..\slide\sdk-all.js ..\..\core\build\jsnative\slide\script.bin
xcopy /s ..\..\core\build\jsnative ..\..\core-ext\resources_native\jsnative\ xcopy /s/y ..\..\core\build\jsnative ..\..\core-ext\resources_native\jsnative\
pause pause
\ No newline at end of file
...@@ -2648,6 +2648,7 @@ function asc_WriteColorSchemes(schemas, s) { ...@@ -2648,6 +2648,7 @@ function asc_WriteColorSchemes(schemas, s) {
} }
} }
} }
AscCommon.asc_WriteColorSchemes = asc_WriteColorSchemes;
function asc_WriteAddFormatTableOptions(c, s) { function asc_WriteAddFormatTableOptions(c, s) {
if (!c) return; if (!c) return;
......
...@@ -1585,14 +1585,15 @@ CTextDrawer.prototype = ...@@ -1585,14 +1585,15 @@ CTextDrawer.prototype =
{ {
this.Get_PathToDraw(false, true, x, y); this.Get_PathToDraw(false, true, x, y);
} }
g_oTextMeasurer.SetFontInternal(this.m_oFont.Name, this.m_oFont.FontSize, Math.max(this.m_oFont.Style, 0)); AscCommon.g_oTextMeasurer.SetFontInternal(this.m_oFont.Name, this.m_oFont.FontSize, Math.max(this.m_oFont.Style, 0));
if (null != this.LastFontOriginInfo.Replace) if (null != this.LastFontOriginInfo.Replace)
{ {
code = g_fontApplication.GetReplaceGlyph(code, this.LastFontOriginInfo.Replace); code = g_fontApplication.GetReplaceGlyph(code, this.LastFontOriginInfo.Replace);
} }
g_oTextMeasurer.m_oManager.LoadStringPathCode(code, false, x, y, this); if (AscCommon.g_oTextMeasurer.m_oManager)
AscCommon.g_oTextMeasurer.m_oManager.LoadStringPathCode(code, false, x, y, this);
}, },
tg : function(gid,x,y) tg : function(gid,x,y)
{ {
......
...@@ -1149,6 +1149,11 @@ CDrawingDocument.prototype = ...@@ -1149,6 +1149,11 @@ CDrawingDocument.prototype =
this.Native["DD_Set_RulerState_HdrFtr"](bHeader, Y0, Y1); this.Native["DD_Set_RulerState_HdrFtr"](bHeader, Y0, Y1);
}, },
Set_RulerState_Columns : function(markup)
{
// TODO:
},
Update_ParaInd : function(Ind) Update_ParaInd : function(Ind)
{ {
var FirstLine = 0, var FirstLine = 0,
......
...@@ -423,6 +423,7 @@ window["CreateTextMeasurerWrapper"] = function() ...@@ -423,6 +423,7 @@ window["CreateTextMeasurerWrapper"] = function()
window["CreateMainTextMeasurerWrapper"] = function() window["CreateMainTextMeasurerWrapper"] = function()
{ {
g_oTextMeasurer = new CTextMeasurerWrapper(); g_oTextMeasurer = new CTextMeasurerWrapper();
AscCommon.g_oTextMeasurer = g_oTextMeasurer;
g_oTextMeasurer.Init(); g_oTextMeasurer.Init();
window['AscCommon'].g_oTextMeasurer = g_oTextMeasurer; window['AscCommon'].g_oTextMeasurer = g_oTextMeasurer;
}; };
...@@ -4351,6 +4351,7 @@ function asc_WriteColorSchemes(schemas, s) { ...@@ -4351,6 +4351,7 @@ function asc_WriteColorSchemes(schemas, s) {
} }
} }
} }
AscCommon.asc_WriteColorSchemes = asc_WriteColorSchemes;
/////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////
......
...@@ -292,14 +292,17 @@ document.createComment = function() { return undefined; }; ...@@ -292,14 +292,17 @@ document.createComment = function() { return undefined; };
document.documentElement = _null_object; document.documentElement = _null_object;
document.body = _null_object; document.body = _null_object;
var native; var native = (typeof native === undefined) ? undefined : native;
if(typeof NativeEngine === "undefined") if (!native)
{ {
if (typeof NativeEngine === "undefined")
{
native = CreateNativeEngine(); native = CreateNativeEngine();
} }
else else
{ {
native = NativeEngine; native = NativeEngine;
}
} }
window.native = native; window.native = native;
...@@ -379,7 +382,7 @@ function NativeOpenFile2(_params) ...@@ -379,7 +382,7 @@ function NativeOpenFile2(_params)
if (schemes) { if (schemes) {
var st = global_memory_stream_menu; var st = global_memory_stream_menu;
st["ClearNoAttack"](); st["ClearNoAttack"]();
asc_WriteColorSchemes(schemes, st); AscCommon.asc_WriteColorSchemes(schemes, st);
window["native"]["OnCallMenuEvent"](2404, st); // ASC_MENU_EVENT_TYPE_COLOR_SCHEMES window["native"]["OnCallMenuEvent"](2404, st); // ASC_MENU_EVENT_TYPE_COLOR_SCHEMES
} }
} }
......
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