From df80eb2f23ecff953225f3e16b9317b48db361da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrg=20Lehni?= <juerg@scratchdisk.com>
Date: Fri, 1 Nov 2013 11:46:31 +0100
Subject: [PATCH] Define PaperScope#paper as a reference to the local scope.

And use it to fix Raster JSON example.
---
 examples/JSON/Raster.html |  2 +-
 src/core/PaperScope.js    | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/examples/JSON/Raster.html b/examples/JSON/Raster.html
index 3190e02f..3aac4b86 100644
--- a/examples/JSON/Raster.html
+++ b/examples/JSON/Raster.html
@@ -15,7 +15,7 @@
 	</script>
 	<script type="text/paperscript" canvas="canvas2">
 		window.importJSON = function(json) {
-			project.activate();
+			paper.activate();
 			console.log(json);
 			project.importJSON(json);
 		}
diff --git a/src/core/PaperScope.js b/src/core/PaperScope.js
index c1c5f446..d3a22bc2 100644
--- a/src/core/PaperScope.js
+++ b/src/core/PaperScope.js
@@ -113,6 +113,18 @@ var PaperScope = Base.extend(/** @lends PaperScope# */{
 		return this._tool;
 	},
 
+	/**
+	 * A reference to the local scope. This is required, so `paper` will always
+	 * refer to the local scope, even when calling into it from another scope.
+	 * `paper.activate();` will have to be called in such a situation.
+	 * @type PaperScript
+	 * @private
+	 * @bean
+	 */
+	getPaper: function() {
+		return this;
+	},
+
 	/**
 	 * The list of available tools.
 	 * @name PaperScope#tools