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, 10 insertions, 5 deletions

diff --git a/node_modules/montage/core/event/event-manager.js b/node_modules/montage/core/event/event-manager.js
index abc441c8..4adc3926 100755
--- a/node_modules/montage/core/event/event-manager.js
+++ b/node_modules/montage/core/event/event-manager.js
@@ -24,6 +24,9 @@ var Montage = require("montage").Montage,
     Deserializer = require("core/deserializer").Deserializer,
     defaultEventManager;
 
+// XXX Does not presently function server-side
+if (typeof window !== "undefined") { // client-side
+
 /* This is to handle browsers that have TouchEvents but don't have the global constructor function Touch */
 //if(TouchEvent && typeof window.Touch === "undefined") {
 // HACK: The commented expression fails because Chrome on the desktop also has TouchEvent and in the code we're either registering touch events OR mouse events on most components.
@@ -91,12 +94,12 @@ var EventListenerDescriptor = Montage.create(Montage, {
         serializable: true,
         value: null
     },
-    
+
     listener: {
         serializable: "reference",
         value: null
     },
-    
+
     capture: {
         serializable: true,
         value: null
@@ -111,19 +114,19 @@ Serializer.defineSerializationUnit("listeners", function(object) {
         descriptor,
         listenerDescriptor,
         listener;
-    
+
     for (var type in eventManager.registeredEventListeners) {
         descriptors = eventManager.registeredEventListeners[type];
         descriptor = descriptors && descriptors[uuid];
         if (descriptor) {
             for (var listenerUuid in descriptor.listeners) {
                 listener = descriptor.listeners[listenerUuid];
-                
+
                 eventListenerDescriptor = EventListenerDescriptor.create();
                 eventListenerDescriptor.type = type;
                 eventListenerDescriptor.listener = listener.listener;
                 eventListenerDescriptor.capture = listener.capture;
-                
+
                 eventListenerDescriptors.push(eventListenerDescriptor);
             }
         }
@@ -2073,3 +2076,5 @@ if (typeof window.ondragstart !== undefined) {
     };
 }
 
+} // client-side
+