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

6 files changed, 0 insertions, 128 deletions

diff --git a/node_modules/montage/effect/desaturate-effect.js b/node_modules/montage/effect/desaturate-effect.js
deleted file mode 100755
index defa1973..00000000
--- a/node_modules/montage/effect/desaturate-effect.js
+++ /dev/null
@@ -1,25 +0,0 @@
-/* <copyright>
- This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
- No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
- (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
- </copyright> */
-var Montage = require("montage").Montage;
-var Effect = require("effect/effect").Effect;
-
-exports.DesaturateEffect = Montage.create(Effect, {
-
-    applyEffect: {
-        value: function(pixels, pixelCount) {
-            var i = 0,
-                average;
-
-            for (i = 0; i < pixelCount; i += 4) {
-                average = (pixels[i] + pixels[i+1] + pixels[i+2])/ 3;
-                pixels[i] = average;
-                pixels[i+1] = average;
-                pixels[i+2] = average;
-            }
-        }
-    }
-
-});
diff --git a/node_modules/montage/effect/effect.js b/node_modules/montage/effect/effect.js
deleted file mode 100755
index 4c5bb52c..00000000
--- a/node_modules/montage/effect/effect.js
+++ /dev/null
@@ -1,15 +0,0 @@
-/* <copyright>
- This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
- No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
- (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
- </copyright> */
-var Montage = require("montage").Montage;
-
-var Effect = exports.Effect = Montage.create(Montage, {
-
-    applyEffect: {
-        enumerable: false,
-        value: null
-    }
-
-});
diff --git a/node_modules/montage/effect/invert-effect.js b/node_modules/montage/effect/invert-effect.js
deleted file mode 100755
index d5a3f7cf..00000000
--- a/node_modules/montage/effect/invert-effect.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* <copyright>
- This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
- No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
- (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
- </copyright> */
-var Montage = require("montage").Montage;
-var Effect = require("effect/effect").Effect;
-
-exports.InvertEffect = Montage.create(Effect, {
-
-    applyEffect: {
-        value: function(pixels, pixelCount) {
-            var i;
-
-            for (i = 0; i < pixelCount; i += 4) {
-                pixels[i] = 255 - pixels[i];
-                pixels[i+1] = 255 - pixels[i+1];
-                pixels[i+2] = 255 - pixels[i+2];
-            }
-        }
-    }
-
-});
diff --git a/node_modules/montage/effect/kaliedoscope-effect.js b/node_modules/montage/effect/kaliedoscope-effect.js
deleted file mode 100755
index 38462602..00000000
--- a/node_modules/montage/effect/kaliedoscope-effect.js
+++ /dev/null
@@ -1,17 +0,0 @@
-/* <copyright>
- This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
- No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
- (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
- </copyright> */
-var Montage = require("montage").Montage;
-var Effect = require("effect/effect").Effect;
-
-exports.KaliedoscopeEffect = Montage.create(Effect, {
-
-    applyEffect: {
-        value: function() {
-            console.log("kaliedoscope")
-        }
-    }
-
-});
diff --git a/node_modules/montage/effect/multiply-effect.js b/node_modules/montage/effect/multiply-effect.js
deleted file mode 100755
index b8599668..00000000
--- a/node_modules/montage/effect/multiply-effect.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* <copyright>
- This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
- No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
- (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
- </copyright> */
-var Montage = require("montage").Montage;
-var Effect = require("effect/effect").Effect;
-
-exports.MultiplyEffect = Montage.create(Effect, {
-
-    applyEffect: {
-        value: function(pixels, pixelCount, multiplier) {
-            var i = 0;
-
-            for (i = 0; i < pixelCount; i += 4) {
-                pixels[i  ] = pixels[i  ] * multiplier; // red
-                pixels[i+1] = pixels[i+1] * multiplier; // green
-                pixels[i+2] = pixels[i+2] * multiplier; // blue
-            }
-        }
-    }
-
-});
diff --git a/node_modules/montage/effect/sepia-effect.js b/node_modules/montage/effect/sepia-effect.js
deleted file mode 100755
index 779074b7..00000000
--- a/node_modules/montage/effect/sepia-effect.js
+++ /dev/null
@@ -1,25 +0,0 @@
-/* <copyright>
- This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
- No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
- (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
- </copyright> */
-var Montage = require("montage").Montage;
-var Effect = require("effect/effect").Effect;
-
-exports.SepiaEffect = Montage.create(Effect, {
-
-    applyEffect: {
-        value: function(pixels, pixelCount) {
-            var i = 0,
-                    average;
-
-            for (i = 0; i < pixelCount; i += 4) {
-                average = (pixels[i  ] + pixels[i+1] + pixels[i+2])/ 3;
-                pixels[i  ] = average + 10; // red
-                pixels[i+1] = average; // green
-                pixels[i+2] = average; // blue
-            }
-        }
-    }
-
-});