move HatchPattern to common

common/Drawings/HatchPattern to function-closure

build/configs/webexcel.json

@@ -64,6 +64,7 @@
 		"../common/CollaborativeEditingBase.js",
 		"../common/Controls.js",
 		"../common/Overlay.js",
+		"../common/Drawings/HatchPattern.js",
 		
 		"../common/scroll.js",
 		"../cell/view/iscroll.js",
@@ -71,7 +72,7 @@
         "../common/wordcopypaste.js",
 
         "../cell/apiDefines.js",
-        "../word/Drawing/HatchPattern.js",
+		
         "../word/Drawing/WorkEvents.js",
         "../cell/document/empty-workbook.js",
         "../cell/utils/utils.js",

build/configs/webpowerpoint.json

@@ -64,6 +64,7 @@
 		"../common/CollaborativeEditingBase.js",
 		"../common/Controls.js",
 		"../common/Overlay.js",
+		"../common/Drawings/HatchPattern.js",
 		
 		"../common/scroll.js",
 
@@ -88,7 +89,6 @@
         "../word/Editor/Common.js",
         "../word/Editor/Sections.js",
         "../word/Editor/History.js",
-        "../word/Drawing/HatchPattern.js",
         "../word/Drawing/Graphics.js",
         "../word/Drawing/ShapeDrawer.js",
         "../slide/Drawing/Transitions.js",

build/configs/webword.json

@@ -67,6 +67,7 @@
 		"../common/CollaborativeEditingBase.js",
 		"../common/Controls.js",
 		"../common/Overlay.js",
+		"../common/Drawings/HatchPattern.js",
 		
 		"../common/scroll.js",
 		"../common/Scrolls/iscroll.js",
@@ -112,7 +113,6 @@
         "../word/Editor/FontClassification.js",
         "../word/Editor/Spelling.js",
         "../word/Drawing/Graphics.js",
-        "../word/Drawing/HatchPattern.js",
         "../word/Drawing/ShapeDrawer.js",
         "../word/Drawing/DrawingDocument.js",
         "../word/Drawing/GraphicsEvents.js",

cell/model/DrawingObjects/ShapeDrawer.js

@@ -1003,7 +1003,7 @@ CShapeDrawer.prototype =
 
                 var _ctx = (this.Graphics.IsTrack === true) ? this.Graphics.Graphics.m_oContext : this.Graphics.m_oContext;
 
-                var _patt_name = global_hatch_names[_fill.ftype];
+                var _patt_name = AscCommon.global_hatch_names[_fill.ftype];
                 if (undefined == _patt_name)
                     _patt_name = "cross";
 
@@ -1013,7 +1013,7 @@ CShapeDrawer.prototype =
                 var __fa = (null === this.UniFill.transparent) ? _fc.A : 255;
                 var __ba = (null === this.UniFill.transparent) ? _bc.A : 255;
 
-                var _test_pattern = GetHatchBrush(_patt_name, _fc.R, _fc.G, _fc.B, __fa, _bc.R, _bc.G, _bc.B, __ba);
+                var _test_pattern = AscCommon.GetHatchBrush(_patt_name, _fc.R, _fc.G, _fc.B, __fa, _bc.R, _bc.G, _bc.B, __ba);
                 var patt = _ctx.createPattern(_test_pattern.Canvas, "repeat");
 
                 _ctx.save();
@@ -1387,7 +1387,7 @@ CShapeDrawer.prototype =
                     var _fill = this.UniFill.fill;
                     if (_fill.type == c_oAscFill.FILL_TYPE_PATT)
                     {
-                        var _patt_name = global_hatch_names[_fill.ftype];
+                        var _patt_name = AscCommon.global_hatch_names[_fill.ftype];
                         if (undefined == _patt_name)
                             _patt_name = "cross";
 
@@ -1397,7 +1397,7 @@ CShapeDrawer.prototype =
                         var __fa = (null === this.UniFill.transparent) ? _fc.A : 255;
                         var __ba = (null === this.UniFill.transparent) ? _bc.A : 255;
 
-                        var _pattern = GetHatchBrush(_patt_name, _fc.R, _fc.G, _fc.B, __fa, _bc.R, _bc.G, _bc.B, __ba);
+                        var _pattern = AscCommon.GetHatchBrush(_patt_name, _fc.R, _fc.G, _fc.B, __fa, _bc.R, _bc.G, _bc.B, __ba);
 
                         var _url64 = "";
                         try

word/Drawing/HatchPattern.js → common/Drawings/HatchPattern.js

 "use strict";
 
+(function(window, undefined){
+
 var global_hatch_data = [
     /* cross */
     0,0,0,0,0,0,0,0,
@@ -749,3 +751,9 @@ function GetHatchBrush(name, r, g, b, a, br, bg, bb, ba)
     global_hatch_brushes[name] = _brush;
     return _brush;
 }
+
+    //--------------------------------------------------------export----------------------------------------------------
+    window['AscCommon'] = window['AscCommon'] || {};
+    window['AscCommon'].global_hatch_names = global_hatch_names;
+    window['AscCommon'].GetHatchBrush = GetHatchBrush;
+})(window);

common/Native/Wrappers/ShapeDrawer.js

@@ -906,7 +906,7 @@ CShapeDrawer.prototype =
             }
             case Asc.c_oAscFill.FILL_TYPE_PATT:
             {
-                var _patt_name = global_hatch_names[_fill.ftype];
+                var _patt_name = AscCommon.global_hatch_names[_fill.ftype];
                 if (undefined == _patt_name)
                     _patt_name = "cross";
 
@@ -1166,7 +1166,7 @@ CShapeDrawer.prototype =
                 var _fill = this.UniFill.fill;
                 if (_fill.type == Asc.c_oAscFill.FILL_TYPE_PATT)
                 {
-                    var _patt_name = global_hatch_names[_fill.ftype];
+                    var _patt_name = AscCommon.global_hatch_names[_fill.ftype];
                     if (undefined == _patt_name)
                         _patt_name = "cross";
 
@@ -1176,7 +1176,7 @@ CShapeDrawer.prototype =
                     var __fa = (null === this.UniFill.transparent) ? _fc.A : 255;
                     var __ba = (null === this.UniFill.transparent) ? _bc.A : 255;
 
-                    var _pattern = GetHatchBrush(_patt_name, _fc.R, _fc.G, _fc.B, __fa, _bc.R, _bc.G, _bc.B, __ba);
+                    var _pattern = AscCommon.GetHatchBrush(_patt_name, _fc.R, _fc.G, _fc.B, __fa, _bc.R, _bc.G, _bc.B, __ba);
 
                     var _url64 = "";
                     try

word/Drawing/ShapeDrawer.js

@@ -976,7 +976,7 @@ CShapeDrawer.prototype =
 
                 var _ctx = (this.Graphics.IsTrack === true) ? this.Graphics.Graphics.m_oContext : this.Graphics.m_oContext;
 
-                var _patt_name = global_hatch_names[_fill.ftype];
+                var _patt_name = AscCommon.global_hatch_names[_fill.ftype];
                 if (undefined == _patt_name)
                     _patt_name = "cross";
 
@@ -986,7 +986,7 @@ CShapeDrawer.prototype =
                 var __fa = (null === this.UniFill.transparent) ? _fc.A : 255;
                 var __ba = (null === this.UniFill.transparent) ? _bc.A : 255;
 
-                var _test_pattern = GetHatchBrush(_patt_name, _fc.R, _fc.G, _fc.B, __fa, _bc.R, _bc.G, _bc.B, __ba);
+                var _test_pattern = AscCommon.GetHatchBrush(_patt_name, _fc.R, _fc.G, _fc.B, __fa, _bc.R, _bc.G, _bc.B, __ba);
                 var patt = _ctx.createPattern(_test_pattern.Canvas, "repeat");
 
                 _ctx.save();
@@ -1372,7 +1372,7 @@ CShapeDrawer.prototype =
                     var _fill = this.UniFill.fill;
                     if (_fill.type == c_oAscFill.FILL_TYPE_PATT)
                     {
-                        var _patt_name = global_hatch_names[_fill.ftype];
+                        var _patt_name = AscCommon.global_hatch_names[_fill.ftype];
                         if (undefined == _patt_name)
                             _patt_name = "cross";
 
@@ -1382,7 +1382,7 @@ CShapeDrawer.prototype =
                         var __fa = (null === this.UniFill.transparent) ? _fc.A : 255;
                         var __ba = (null === this.UniFill.transparent) ? _bc.A : 255;
 
-                        var _pattern = GetHatchBrush(_patt_name, _fc.R, _fc.G, _fc.B, __fa, _bc.R, _bc.G, _bc.B, __ba);
+                        var _pattern = AscCommon.GetHatchBrush(_patt_name, _fc.R, _fc.G, _fc.B, __fa, _bc.R, _bc.G, _bc.B, __ba);
 
                         var _url64 = "";
                         try