Merge branch 'components' of https://github.com/mencio/ninja-internal into integration

Conflicts:
	js/io/document/html-document.js

Signed-off-by: Valerio Virgillito <valerio@motorola.com>

1 files changed, 17 insertions, 0 deletions

diff --git a/node_modules/ninja-components/effect/kaliedoscope-effect.js b/node_modules/ninja-components/effect/kaliedoscope-effect.js
new file mode 100755
index 00000000..38462602
--- /dev/null
+++ b/node_modules/ninja-components/effect/kaliedoscope-effect.js
@@ -0,0 +1,17 @@
+/* <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")
+        }
+    }
+
+});