From a4572288462f7ade554798fbd8e74ebc74b5101d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrg=20Lehni?= Date: Wed, 8 Oct 2014 15:52:41 +0200 Subject: [PATCH] Fix formatting issues. --- src/canvas/ProxyContext.js | 2 +- src/docs/global.js | 24 ++++++++++++------------ src/export.js | 3 +++ src/ui/Component.js | 8 ++++---- src/ui/Palette.js | 8 ++++---- 5 files changed, 24 insertions(+), 21 deletions(-) diff --git a/src/canvas/ProxyContext.js b/src/canvas/ProxyContext.js index eeab7882..43ee21ff 100644 --- a/src/canvas/ProxyContext.js +++ b/src/canvas/ProxyContext.js @@ -10,7 +10,7 @@ * All rights reserved. */ - /** +/** * @name ProxyContext * * @class The ProxyContext is a helper class that helps Canvas debugging diff --git a/src/docs/global.js b/src/docs/global.js index eb626861..e6091e5c 100644 --- a/src/docs/global.js +++ b/src/docs/global.js @@ -10,18 +10,18 @@ * All rights reserved. */ - /** - * @name _global_ - * @namespace - * - * When code is executed as PaperScript, the script's scope is populated with - * all fields of the currently active {@link PaperScope} object, which within - * the script appear to be global. - * - * In a JavaScript context, only the {@link paper} variable is added to the - * global scope, referencing the currently active {@link PaperScope} object, - * through which all properties and Paper.js classes can be accessed. - */ +/** + * @name _global_ + * @namespace + * + * When code is executed as PaperScript, the script's scope is populated with + * all fields of the currently active {@link PaperScope} object, which within + * the script appear to be global. + * + * In a JavaScript context, only the {@link paper} variable is added to the + * global scope, referencing the currently active {@link PaperScope} object, + * through which all properties and Paper.js classes can be accessed. + */ /** @scope _global_ */{ /** diff --git a/src/export.js b/src/export.js index fe8d5c22..bc84161b 100644 --- a/src/export.js +++ b/src/export.js @@ -15,6 +15,9 @@ // PaperScope, and create the initial paper object, all in one statement: /*#*/ if (__options.environment == 'browser') { +// NOTE: Do not create local variable `var paper` since it would shield the +// global one in the whole scope. + paper = new (PaperScope.inject(Base.exports, { // Mark fields as enumerable so PaperScope.inject can pick them up enumerable: true, diff --git a/src/ui/Component.js b/src/ui/Component.js index 3b948123..c9b66347 100644 --- a/src/ui/Component.js +++ b/src/ui/Component.js @@ -10,10 +10,10 @@ * All rights reserved. */ - /** - * @name Component - * @class - */ +/** + * @name Component + * @class + */ var Component = Base.extend(Emitter, /** @lends Component# */{ _class: 'Component', _events: [ 'onChange', 'onClick' ], diff --git a/src/ui/Palette.js b/src/ui/Palette.js index d98aaed8..f74840a1 100644 --- a/src/ui/Palette.js +++ b/src/ui/Palette.js @@ -10,10 +10,10 @@ * All rights reserved. */ - /** - * @name Palette - * @class - */ +/** + * @name Palette + * @class + */ var Palette = Base.extend(Emitter, /** @lends Palette# */{ _class: 'Palette', _events: [ 'onChange' ],