From 53dac53ca0dcd8b61c621acf5ed76a75fe5f6351 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrg=20Lehni?= Date: Fri, 19 Apr 2013 19:38:48 -0700 Subject: [PATCH] Restructure code organization by separating canvas related utility classes into separate canvas folder, and move inclusion of utilities classes to beginning. Was needed because Numerical.KAPPA is accessed at compile time. --- src/{util => canvas}/BlendMode.js | 0 src/{util => canvas}/CanvasProvider.js | 0 src/{util => canvas}/ProxyContext.js | 0 src/paper.js | 11 ++++++----- 4 files changed, 6 insertions(+), 5 deletions(-) rename src/{util => canvas}/BlendMode.js (100%) rename src/{util => canvas}/CanvasProvider.js (100%) rename src/{util => canvas}/ProxyContext.js (100%) diff --git a/src/util/BlendMode.js b/src/canvas/BlendMode.js similarity index 100% rename from src/util/BlendMode.js rename to src/canvas/BlendMode.js diff --git a/src/util/CanvasProvider.js b/src/canvas/CanvasProvider.js similarity index 100% rename from src/util/CanvasProvider.js rename to src/canvas/CanvasProvider.js diff --git a/src/util/ProxyContext.js b/src/canvas/ProxyContext.js similarity index 100% rename from src/util/ProxyContext.js rename to src/canvas/ProxyContext.js diff --git a/src/paper.js b/src/paper.js index b5af4a49..0d6ffb94 100644 --- a/src/paper.js +++ b/src/paper.js @@ -46,6 +46,9 @@ var paper = new function() { /*#*/ include('core/PaperScope.js'); /*#*/ include('core/PaperScopeItem.js'); +/*#*/ include('util/Formatter.js'); +/*#*/ include('util/Numerical.js'); + // Include Paper classes, which are later injected into PaperScope by setting // them on the 'this' object, e.g.: // var Point = this.Point = Base.extend(...); @@ -107,12 +110,10 @@ var paper = new function() { /*#*/ include('tool/Tool.js'); /*#*/ } // options.browser -/*#*/ include('util/Formatter.js'); -/*#*/ include('util/CanvasProvider.js'); -/*#*/ include('util/Numerical.js'); -/*#*/ include('util/BlendMode.js'); +/*#*/ include('canvas/CanvasProvider.js'); +/*#*/ include('canvas/BlendMode.js'); /*#*/ if (options.version == 'dev') { -/*#*/ include('util/ProxyContext.js'); +/*#*/ include('canvas/ProxyContext.js'); /*#*/ } // options.browser /*#*/ if (options.svg) {