Merge branch 'master' into components

Conflicts:
	node_modules/montage/ui/bluemoon/progress.reel/progress.html
	node_modules/montage/ui/image2.reel/image2.html
	node_modules/ninja-components/effect/desaturate-effect.js
	node_modules/ninja-components/effect/effect.js
	node_modules/ninja-components/effect/invert-effect.js
	node_modules/ninja-components/effect/kaliedoscope-effect.js
	node_modules/ninja-components/effect/multiply-effect.js
	node_modules/ninja-components/effect/sepia-effect.js
	node_modules/ninja-components/flow-controller.reel/flow-controller.html
	node_modules/ninja-components/flow-controller.reel/flow-controller.js
	node_modules/ninja-components/flow-offset.js
	node_modules/ninja-components/hottext.reel/hottext.css
	node_modules/ninja-components/hottext.reel/hottext.html
	node_modules/ninja-components/hottext.reel/hottext.js
	node_modules/ninja-components/hottextunit.reel/hottextunit.css
	node_modules/ninja-components/hottextunit.reel/hottextunit.html
	node_modules/ninja-components/hottextunit.reel/hottextunit.js
	node_modules/ninja-components/image2.reel/image2.html
	node_modules/ninja-components/image2.reel/image2.js
	node_modules/ninja-components/image3d.reel/image3d.html
	node_modules/ninja-components/image3d.reel/image3d.js
	node_modules/ninja-components/photo-editor.reel/photo-editor.css
	node_modules/ninja-components/photo-editor.reel/photo-editor.html
	node_modules/ninja-components/photo-editor.reel/photo-editor.js
	node_modules/ninja-components/slider-base.js
	user-document-templates/montage-application-cloud/appdelegate.js

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

1 files changed, 56 insertions, 0 deletions

diff --git a/node_modules/montage/ui/bluemoon/textfield.reel/textfield.js b/node_modules/montage/ui/bluemoon/textfield.reel/textfield.js
new file mode 100644
index 00000000..6de3d636
--- /dev/null
+++ b/node_modules/montage/ui/bluemoon/textfield.reel/textfield.js
@@ -0,0 +1,56 @@
+/* <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> */
+/**
+        @module "montage/ui/bluemoon/textfield.reel"
+    @requires montage/core/core
+    @requires montage/ui/editable-text
+*/
+var Montage = require("montage").Montage,
+    EditableText = require("ui/editable-text").EditableText;
+/**
+    @class module:"montage/ui/bluemoon/textfield.reel".Textfield
+    @extends module:montage/ui/editable-text.EditableText
+*/
+var Textfield = exports.Textfield = Montage.create(EditableText,/** @lends module:"montage/ui/bluemoon/textfield.reel".Textfield# */ {
+/**
+        Description TODO
+        @type {Property}
+        @default null
+    */
+    delegate: {
+        enumerable: true,
+        value: null
+    },
+
+    _placeholder: {
+        value: null
+    },
+
+    placeholder: {
+        get: function() {
+            return this._placeholder;
+        },
+        set: function(value) {
+            if(this._placeholder !== value) {
+                this._placeholder = value;
+                this.needsDraw = true;
+            }
+        }
+    },
+/**
+  Description TODO
+  @private
+*/
+    _drawSpecific: {
+        enumerable: false,
+        value: function() {
+            this.element.classList.add('montage-textfield');
+
+            this.element.placeholder = this._placeholder;
+        }
+    }
+});
+