Merge branch 'refs/heads/NinjaInternal' into Color

Conflicts:
	js/controllers/elements/shapes-controller.js
	js/data/pi/pi-data.js
	js/panels/properties/content.reel/content.js

1 files changed, 5 insertions, 0 deletions

diff --git a/node_modules/montage/core/event/mutable-event.js b/node_modules/montage/core/event/mutable-event.js
index edf56951..f94ee0b9 100755
--- a/node_modules/montage/core/event/mutable-event.js
+++ b/node_modules/montage/core/event/mutable-event.js
@@ -11,6 +11,9 @@
 var Montage = require("montage").Montage,
     Enum = require("core/enum").Enum;
 
+// XXX Does not presently function server-side
+if (typeof window !== "undefined") {
+
 var ChangeTypes = exports.ChangeTypes = Enum.create().initWithMembers("MODIFICATION", "ADDITION", "REMOVAL");
 
 var _eventConstructorsByType = {};
@@ -232,3 +235,5 @@ _changeEventConstructor.prototype = MutableEvent.create()._initPrototypeWithEven
 */
 _changeEventConstructor.prototype.type = "change";
 exports._Change = _changeEventConstructor;
+
+} // client-side