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, 26 insertions, 0 deletions

diff --git a/node_modules/montage/ui/anchor.reel/anchor.js b/node_modules/montage/ui/anchor.reel/anchor.js
new file mode 100644
index 00000000..d8ac1d8f
--- /dev/null
+++ b/node_modules/montage/ui/anchor.reel/anchor.js
@@ -0,0 +1,26 @@
+/* <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,
+    Component = require("ui/component").Component,
+    NativeControl = require("ui/native-control").NativeControl;
+
+/**
+ * The <a> native control with binding support for the standard attributes
+ */
+var Anchor = exports.Anchor = Montage.create(NativeControl, {
+
+});
+
+http://www.w3.org/TR/html5/text-level-semantics.html#the-a-element
+Anchor.addAttributes({
+        textContent: null,
+        href: null,
+        hreflang: null,
+        media: null,
+        rel: null,
+        target: null,
+        type: null
+});