Рефакторинг офиса.

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@46985 954022d7-b5bf-4e40-9824-e11837661b57

OfficeWebPowerPoint/Build/apiExtern.js

+//Tihs file containes definition of object which used in api.js
+//It need to prevent minimize the name of object's method.
+
+//WaitDownload(){};
+//function Search(text){};
+//function startSearch(){};
+//function stopSearch(){};
+function $(){};
\ No newline at end of file

OfficeWebPowerPoint/Build/build_sdk_all.bat

+@ECHO OFF
+
+SET BUILD_DIR=%CD%
+
+SET SOURCE_MAP_NAME=SourceMap.js
+
+SET OUTPUT_SCRIPT_NAME=%~nx1
+SET OUTPUT_FOLDER=%~dp1
+
+SET LOG_FOLDER=%~f2
+
+CD ..
+
+SET COMMON_FOLDER=..\OfficeWebCommon
+SET TEXT_ENGINE=..\OfficeWebWord\WebWord
+SET FONT_ENGINE=..\OfficeWebWord\FontsFreeType
+SET PRESENTATION_ENGINE=.
+
+SET EDITOR_API_EXPORT_FILE=%LOG_FOLDER%\apiExport.js
+
+SET VARIABLE_MAP_FILE=%LOG_FOLDER%\variable.map
+SET PROPERTY_MAP_FILE=%LOG_FOLDER%\property.map
+
+SET OUTVAL_MAP_FILE=%LOG_FOLDER%\out_val.map
+SET OUTOBF_MAP_FILE=%LOG_FOLDER%\out_obf.map
+
+SET GCC_DEFINE=%3
+
+SET CLOSURE_COMPILER=com.google.javascript.jscomp.CommandLineRunner
+
+ECHO Make output folder: %LOG_FOLDER%
+MKDIR %LOG_FOLDER%
+
+
+rem --formatting PRETTY_PRINT ^
+
+SET EDITOR_API_FILE=%PRESENTATION_ENGINE%\api-all.js
+COPY /Y /B "%PRESENTATION_ENGINE%\apiCommon.js"+"%PRESENTATION_ENGINE%\api.js" "%EDITOR_API_FILE%"
+
+SET EDITOR_APIDEFINE_FILE=%PRESENTATION_ENGINE%\apiDefines.js
+
+ECHO ON
+%BUILD_DIR%\ExtractJSApi.exe "%EDITOR_API_FILE%" "%EDITOR_API_EXPORT_FILE%"
+
+java %CLOSURE_COMPILER% ^
+--compilation_level ADVANCED_OPTIMIZATIONS ^
+--externs "%TEXT_ENGINE%\Drawing\scrolls\jquery.min.js" ^
+--externs "%COMMON_FOLDER%\3rdparty\Underscore\underscore-min.js" ^
+--externs "%COMMON_FOLDER%\3rdparty\Sockjs\sockjs-0.3.min.js" ^
+--externs "%BUILD_DIR%\apiExtern.js" ^
+--js ^
+	"%COMMON_FOLDER%\License.js" ^
+	"%COMMON_FOLDER%\docscoapicommon.js" ^
+	"%COMMON_FOLDER%\docscoapi.js" ^
+	"%COMMON_FOLDER%\downloaderfiles.js" ^
+	"%FONT_ENGINE%\font_engine.js" ^
+	"%FONT_ENGINE%\FontFile.js" ^
+	"%FONT_ENGINE%\FontManager.js" ^
+	"%TEXT_ENGINE%\Drawing\Externals.js" ^
+	"%TEXT_ENGINE%\Drawing\AllFonts.js" ^
+	"%PRESENTATION_ENGINE%\Drawing\GlobalLoaders.js" ^
+	"%PRESENTATION_ENGINE%\Drawing\ThemeLoader.js" ^
+	"%PRESENTATION_ENGINE%\Editor\CollaborativeEditing.js" ^
+	"%FONT_ENGINE%\FontExport.js" ^
+	"%PRESENTATION_ENGINE%\Editor\Styles.js" ^
+	"%PRESENTATION_ENGINE%\Editor\ParagraphContent.js" ^
+	"%TEXT_ENGINE%\Drawing\Metafile.js" ^
+	"%TEXT_ENGINE%\Drawing\GraphicsEvents.js" ^
+	"%TEXT_ENGINE%\Drawing\WorkEvents.js" ^
+	"%TEXT_ENGINE%\Drawing\Controls.js" ^
+	"%TEXT_ENGINE%\Drawing\Rulers.js" ^
+	"%PRESENTATION_ENGINE%\Editor\Table.js" ^
+	"%TEXT_ENGINE%\Editor\Common.js" ^
+	"%TEXT_ENGINE%\Editor\Sections.js" ^
+	"%TEXT_ENGINE%\Editor\CollaborativeEditing.js" ^
+	"%TEXT_ENGINE%\Drawing\scrolls\scroll.js" ^
+	"%PRESENTATION_ENGINE%\Editor\History.js" ^
+	"%PRESENTATION_ENGINE%\Editor\Paragraph.js" ^
+	"%PRESENTATION_ENGINE%\Editor\FlowObjects.js" ^
+	"%PRESENTATION_ENGINE%\Editor\DocumentContent.js" ^
+	"%PRESENTATION_ENGINE%\Editor\Presentation.js" ^
+	"%PRESENTATION_ENGINE%\Editor\SlideShowInfo.js" ^
+	"%PRESENTATION_ENGINE%\Editor\PresentationProperties.js" ^
+	"%PRESENTATION_ENGINE%\Editor\Shape.js" ^
+	"%PRESENTATION_ENGINE%\Editor\GraphicFrame.js" ^
+	"%PRESENTATION_ENGINE%\Editor\Numbering.js" ^
+	"%PRESENTATION_ENGINE%\Editor\TextBody.js" ^
+	"%PRESENTATION_ENGINE%\Editor\TableShape.js" ^
+	"%PRESENTATION_ENGINE%\Editor\Drawing\Arrows.js" ^
+	"%PRESENTATION_ENGINE%\Editor\Drawing\Geometry.js" ^
+	"%PRESENTATION_ENGINE%\Editor\Drawing\CreateGoemetry.js" ^
+	"%PRESENTATION_ENGINE%\Editor\Drawing\ColorArray.js" ^
+	"%PRESENTATION_ENGINE%\Editor\Drawing\Math.js" ^
+	"%PRESENTATION_ENGINE%\Editor\Drawing\Path.js" ^
+	"%PRESENTATION_ENGINE%\Editor\Drawing\ArcTo.js" ^
+	"%PRESENTATION_ENGINE%\Editor\Drawing\ArcToOnCanvasContext.js" ^
+	"%PRESENTATION_ENGINE%\Editor\Drawing\GraphicFigure.js" ^
+	"%PRESENTATION_ENGINE%\Editor\Drawing\Clone.js" ^
+	"%PRESENTATION_ENGINE%\Editor\Drawing\CImage.js" ^
+	"%PRESENTATION_ENGINE%\Editor\Drawing\StatesAutoShapes.js" ^
+	"%PRESENTATION_ENGINE%\Editor\Drawing\AutoShapesContainer.js" ^
+	"%PRESENTATION_ENGINE%\Editor\Drawing\Spline.js" ^
+	"%PRESENTATION_ENGINE%\Editor\Drawing\PolyLine.js" ^
+	"%PRESENTATION_ENGINE%\Editor\Drawing\PolyLine2.js" ^
+	"%PRESENTATION_ENGINE%\Editor\Drawing\Hit.js" ^
+	"%PRESENTATION_ENGINE%\Editor\Drawing\GroupShape.js" ^
+	"%PRESENTATION_ENGINE%\Editor\Drawing\Joined.js" ^
+	"%PRESENTATION_ENGINE%\Drawing\Graphics.js" ^
+	"%PRESENTATION_ENGINE%\Drawing\DrawingDocument.js" ^
+	"%PRESENTATION_ENGINE%\Drawing\HtmlPage.js" ^
+	"%PRESENTATION_ENGINE%\Editor\Format.js" ^
+	"%PRESENTATION_ENGINE%\Editor\Serialize.js" ^
+	"%PRESENTATION_ENGINE%\Editor\SerializeWriter.js" ^
+	"%EDITOR_APIDEFINE_FILE%" ^
+	"%EDITOR_API_FILE%" ^
+	"%EDITOR_API_EXPORT_FILE%" ^
+	--define=%GCC_DEFINE% ^
+	--js_output_file "%OUTPUT_SCRIPT_NAME%" ^
+	--warning_level QUIET ^
+	--variable_map_output_file "%VARIABLE_MAP_FILE%" ^
+	--property_map_output_file "%PROPERTY_MAP_FILE%" ^
+	--create_source_map "%OUTPUT_SCRIPT_NAME%.map" ^
+	--source_map_format=V3
+
+@if NOT "%ERRORLEVEL%"=="0" goto error
+
+SET OUTPUT_APIDEFINE_FILE=%EDITOR_APIDEFINE_FILE%.tmp
+
+java %CLOSURE_COMPILER% ^
+	--compilation_level SIMPLE_OPTIMIZATIONS ^
+	--js "%EDITOR_APIDEFINE_FILE%" ^
+	--js_output_file "%OUTPUT_APIDEFINE_FILE%"
+
+@if NOT "%ERRORLEVEL%"=="0" goto error
+
+ECHO //@ sourceMappingURL=http://localhost:8080/sdk/OfficeWebPowerPoint/%OUTPUT_SCRIPT_NAME%.map>"%SOURCE_MAP_NAME%"
+
+COPY /Y /B "%OUTPUT_SCRIPT_NAME%"+"%OUTPUT_APIDEFINE_FILE%"+"%SOURCE_MAP_NAME%" "%OUTPUT_SCRIPT_NAME%"
+MOVE /Y "%OUTPUT_SCRIPT_NAME%" "%OUTPUT_FOLDER%"
+COPY /Y "%OUTPUT_SCRIPT_NAME%.map" "%OUTPUT_FOLDER%"
+DEL /Q "%OUTPUT_APIDEFINE_FILE%"
+DEL /Q "%SOURCE_MAP_NAME%"
+DEL /Q "%EDITOR_API_FILE%"
+
+@ECHO off
+
+cd "%BUILD_DIR%"
+exit /b 0
+
+
+:check_compiler
+java -classpath %CLASSPATH% %CLOSURE_COMPILER% --help >nul 2>&1
+if "%ERRORLEVEL%"=="-1" exit /b 0
+if NOT EXIST google-cc-path.txt echo %cd% > google-cc-path.txt
+:_1
+set /p gccpath=<google-cc-path.txt
+call :check_gccpath "%gccpath%" && exit /b 0
+echo Please enter correct path to Google Closure Complier directory in "google-cc-path.txt" file
+echo.
+start "" /wait notepad google-cc-path.txt
+goto _1
+
+:check_gccpath
+if EXIST "%~1\compiler.jar" (
+  if "%CLASSPATH%"=="" (
+    set CLASSPATH="%~1\compiler.jar"
+  ) else (
+    set CLASSPATH=%CLASSPATH%;"%~1\compiler.jar"
+  )
+  exit /b 0
+)
+exit /b 1
+
+
+:error
+@exit /b 1
\ No newline at end of file

OfficeWebPowerPoint/Build/commit_new_sdk_all.bat

+@echo off
+
+SET STABLE_API_FOLDER=..\..\..\..\..\ASC\Redist\WEB\sdk\OfficeWebPowerPoint
+SET STABLE_API_FOLDER=C:\hg.default\sdk\OfficeWebPowerPoint
+SET STABLE_SDK_FOLDER=%STABLE_API_FOLDER%
+SET STABLE_SDK_JS=%STABLE_SDK_FOLDER%\sdk-all.js
+SET STABLE_SDK_LOG_FOLDER=Log
+SET SDK_SOURCE_FOLDER=..
+
+call :check_svn || exit /b 1
+
+cd /D "%~dp0" || exit /b 1
+
+echo Update OfficeWebWord svn repository
+svn update %SDK_SOURCE_FOLDER%
+
+echo Copy API script.
+XCOPY "%SDK_SOURCE_FOLDER%\api.js" "%STABLE_API_FOLDER%\" /Y /I /Q
+XCOPY "%SDK_SOURCE_FOLDER%\apiCommon.js" "%STABLE_API_FOLDER%\" /Y /I /Q
+XCOPY "%SDK_SOURCE_FOLDER%\apiDefines.js" "%STABLE_API_FOLDER%\" /Y /I /Q
+XCOPY "%SDK_SOURCE_FOLDER%\EditorSettings.js" "%STABLE_API_FOLDER%\" /Y /I /Q
+
+XCOPY "%SDK_SOURCE_FOLDER%\Images\*.*" "%STABLE_API_FOLDER%\Images\" /Y /I /Q /E
+XCOPY "%SDK_SOURCE_FOLDER%\menu\*.*" "%STABLE_API_FOLDER%\menu\" /Y /I /Q /E
+XCOPY "%SDK_SOURCE_FOLDER%\MenuIcons\*.*" "%STABLE_API_FOLDER%\MenuIcons\" /Y /I /Q /E
+XCOPY "%SDK_SOURCE_FOLDER%\index.html.deploy" "%STABLE_API_FOLDER%\index.html" /Y /I /Q
+
+XCOPY  /S "%SDK_SOURCE_FOLDER%\document" "%STABLE_API_FOLDER%\document\" /Y 
+XCOPY  /S "%SDK_SOURCE_FOLDER%\themes" "%STABLE_API_FOLDER%\themes\" /Y 
+
+echo Build new version 
+CALL build_sdk_all.bat %STABLE_SDK_JS% %STABLE_SDK_LOG_FOLDER% "ASC_DOCS_API_DEBUG=true"
+
+XCOPY "%STABLE_SDK_LOG_FOLDER%\property.map" "%STABLE_API_FOLDER%\property.map" /Y /I /Q
+XCOPY "%STABLE_SDK_LOG_FOLDER%\variable.map" "%STABLE_API_FOLDER%\variable.map" /Y /I /Q
+XCOPY "%STABLE_SDK_LOG_FOLDER%\apiExport.js" "%STABLE_API_FOLDER%\apiExport.js" /Y /I /Q
+
+echo Script finished successfully!
+pause
+exit /b 0
+
+:check_svn
+svn help > nul 2>&1
+if errorlevel 1 (
+	echo Cannot find subversion command-line client.
+	pause
+    exit /b 1
+)
+exit /b 0

OfficeWebPowerPoint/Drawing/ThemeLoader.js

+function CThemeLoadInfo()
+{
+    this.FontMap = null;
+    this.ImageMap = null;
+
+    this.Theme = null;
+    this.Master = null;
+    this.Layouts = new Array();
+}
+
+function CThemeLoader()
+{
+    this.Themes = new CAscThemes();
+
+    // editor themes info
+    this.themes_info_editor     = new Array();
+    var count = this.Themes.EditorThemes.length;
+    for (var i = 0; i < count; i++)
+        this.themes_info_editor[i] = null;
+
+    this.themes_info_document   = new Array();
+
+    this.Api = null;
+    this.CurrentLoadThemeIndex = -1;
+    this.ThemesUrl = "";
+
+    var oThis = this;
+
+    this.StartLoadTheme = function(indexTheme)
+    {
+        var theme_info = null;
+        var theme_load_info = null;
+
+        this.Api.StartLoadTheme();
+        this.CurrentLoadThemeIndex = -1;
+
+        if (indexTheme >= 0)
+        {
+            theme_info = this.Themes.EditorThemes[indexTheme];
+            theme_load_info = this.themes_info_editor[indexTheme];
+            this.CurrentLoadThemeIndex = indexTheme;
+        }
+        else
+        {
+            theme_info = this.Themes.DocumentThemes[-indexTheme - 1];
+            theme_load_info = this.themes_info_document[-indexTheme - 1];
+            // при загрузке документа все данные загрузились
+            this.Api.EndLoadTheme(theme_load_info);
+            return;
+        }
+
+        // применяется тема из стандартных.
+        if (null != theme_load_info)
+        {
+            this.Api.EndLoadTheme(theme_load_info);
+            return;
+        }
+
+        this.Api.sync_StartAction(c_oAscAsyncActionType.BlockInteraction, c_oAscAsyncAction.LoadTheme);
+
+        // значит эта тема еще не загружалась
+        var theme_src = this.ThemesUrl + "theme" + (this.CurrentLoadThemeIndex + 1) + "/theme.js";
+        this.LoadThemeJSAsync(theme_src);
+
+        this.Api.StartLoadTheme();
+    }
+
+    this.LoadThemeJSAsync = function(theme_src)
+    {
+        var scriptElem = document.createElement('script');
+
+        if (scriptElem.readyState && false)
+        {
+            scriptElem.onreadystatechange = function () {
+                if (this.readyState == 'complete' || this.readyState == 'loaded')
+                {
+                    scriptElem.onreadystatechange = null;
+                    setTimeout(oThis._callback_theme_load, 0);
+                }
+            }
+        }
+        scriptElem.onload = scriptElem.onerror = oThis._callback_theme_load;
+
+        scriptElem.setAttribute('src',theme_src);
+        scriptElem.setAttribute('type','text/javascript');
+        document.getElementsByTagName('head')[0].appendChild(scriptElem);
+    }
+
+    this._callback_theme_load = function()
+    {
+        var g_th = window["g_theme" + (oThis.CurrentLoadThemeIndex + 1)];
+        if (g_th !== undefined)
+        {
+            var _loader = new BinaryPPTYLoader();
+            _loader.Api = oThis.Api;
+            _loader.IsThemeLoader = true;
+
+            var pres = new Object();
+            pres.themes = new Array();
+            pres.slideMasters = new Array();
+            pres.slideLayouts = new Array();
+
+            _loader.Load(g_th, pres);
+
+            // теперь объект this.themes_info_editor[this.CurrentLoadThemeIndex]
+            oThis.Api.FontLoader.ThemeLoader = oThis;
+            oThis.Api.FontLoader.LoadDocumentFonts2(oThis.themes_info_editor[oThis.CurrentLoadThemeIndex].FontMap);
+            return;
+        }
+        // ошибка!!!
+    }
+
+    this.asyncFontsStartLoaded = function()
+    {
+        // началась загрузка шрифтов
+    }
+
+    this.asyncFontsEndLoaded = function()
+    {
+        // загрузка шрифтов
+        this.Api.FontLoader.ThemeLoader = null;
+        this.Api.ImageLoader.ThemeLoader = this;
+
+        this.Api.ImageLoader.LoadDocumentImages(this.themes_info_editor[this.CurrentLoadThemeIndex].ImageMap);
+    }
+
+    this.asyncImagesStartLoaded = function()
+    {
+        // началась загрузка картинок
+    }
+
+    this.asyncImagesEndLoaded = function()
+    {
+        this.Api.ImageLoader.ThemeLoader = null;
+
+        this.Api.EndLoadTheme(this.themes_info_editor[this.CurrentLoadThemeIndex]);
+        this.CurrentLoadThemeIndex = -1;
+    }
+
+    this._getFullImageSrc = function(src)
+    {
+        var start = src.substring(0, 6);
+        if(0 != src.indexOf("http:") && 0 != src.indexOf("data:") && 0 != src.indexOf("https:") && 0 != src.indexOf("ftp:") && 0 != src.indexOf("file:"))
+            return this.ThemesUrl + "theme" + this.CurrentLoadThemeIndex + "/media/" + src;
+        else
+            return src;
+    }
+
+}

OfficeWebPowerPoint/Editor/Drawing/GraphicFigure.js

+/**
+ * Created by JetBrains WebStorm.
+ * User: Sergey.Luzyanin
+ * Date: 3/30/12
+ * Time: 5:21 PM
+ * To change graphics template use File | Settings | File Templates.
+ */
+function circle(graphics, xc, yc, r)
+{
+    graphics._s();
+    ArcToCurvers(graphics, xc+r, yc, r, r, 0, 2*Math.PI);
+    graphics._z();
+    graphics.ds();
+    graphics.df();
+}
+
+function diamond(graphics, xc, yc, d)
+{
+    d*=0.5;
+    graphics._s();
+    graphics._m(xc, yc-d);
+    graphics._l(xc+d, yc);
+    graphics._l(xc, yc+d);
+    graphics._l(xc-d, yc);
+    graphics._z();
+    graphics.ds();
+    graphics.df();
+}
+
+function square(graphics, xc, yc, d)
+{
+    graphics._s();
+    graphics._m(xc-d, yc-d);
+    graphics._l(xc+d, yc-d);
+    graphics._l(xc+d, yc+d);
+    graphics._l(xc-d, yc+d);
+    graphics._z();
+    graphics.ds();
+    graphics.df();
+}