From f7e4257745ccd44b8d24555f0ef787429d6e472c Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Tue, 5 Jun 2012 00:11:03 -0700
Subject: adding the latest v0.10 montage

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 .../overlays/rich-text-linkpopup.reel/rich-text-linkpopup.html     | 4 ++--
 .../overlays/rich-text-resizer.reel/rich-text-resizer.html         | 4 ++--
 .../rich-text-editor.reel/rich-text-editor-base.js                 | 2 +-
 .../ui/rich-text-editor/rich-text-editor.reel/rich-text-editor.css | 7 +------
 .../rich-text-editor/rich-text-editor.reel/rich-text-editor.html   | 4 ++--
 .../ui/rich-text-editor/rich-text-editor.reel/rich-text-editor.js  | 6 +++---
 6 files changed, 11 insertions(+), 16 deletions(-)

(limited to 'node_modules/montage/ui/rich-text-editor')

diff --git a/node_modules/montage/ui/rich-text-editor/overlays/rich-text-linkpopup.reel/rich-text-linkpopup.html b/node_modules/montage/ui/rich-text-editor/overlays/rich-text-linkpopup.reel/rich-text-linkpopup.html
index 04b52dd6..9595d7ab 100644
--- a/node_modules/montage/ui/rich-text-editor/overlays/rich-text-linkpopup.reel/rich-text-linkpopup.html
+++ b/node_modules/montage/ui/rich-text-editor/overlays/rich-text-linkpopup.reel/rich-text-linkpopup.html
@@ -11,14 +11,14 @@
     <script type="text/montage-serialization">
         {
             "link": {
-                "prototype": "montage/ui/anchor.reel",
+                "prototype": "ui/anchor.reel",
                 "properties": {
                     "element": {"#": "link"}
                 }
             },
 
             "owner": {
-                "prototype": "montage/ui/rich-text-editor/overlays/rich-text-linkpopup.reel[RichTextLinkPopup]",
+                "prototype": "ui/rich-text-editor/overlays/rich-text-linkpopup.reel[RichTextLinkPopup]",
                 "properties": {
                     "element": {"#": "linkpopup-container"},
                     "link": {"@": "link"}
diff --git a/node_modules/montage/ui/rich-text-editor/overlays/rich-text-resizer.reel/rich-text-resizer.html b/node_modules/montage/ui/rich-text-editor/overlays/rich-text-resizer.reel/rich-text-resizer.html
index 59121b61..526d6563 100644
--- a/node_modules/montage/ui/rich-text-editor/overlays/rich-text-resizer.reel/rich-text-resizer.html
+++ b/node_modules/montage/ui/rich-text-editor/overlays/rich-text-resizer.reel/rich-text-resizer.html
@@ -11,14 +11,14 @@
     <script type="text/montage-serialization">
         {
             "image": {
-                "prototype": "montage/ui/image.reel",
+                "prototype": "ui/image.reel",
                 "properties": {
                     "element": {"#": "image"}
                 }
             },
 
             "owner": {
-                "prototype": "montage/ui/rich-text-editor/overlays/rich-text-resizer.reel",
+                "prototype": "ui/rich-text-editor/overlays/rich-text-resizer.reel",
                 "properties": {
                     "element": {"#": "resizer-container"},
                     "image": {"@": "image"}
diff --git a/node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor-base.js b/node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor-base.js
index 71169d00..0bdf67e7 100644
--- a/node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor-base.js
+++ b/node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor-base.js
@@ -593,7 +593,7 @@ exports.RichTextEditorBase = Montage.create(Component,/** @lends module:"montage
                         editorInnerElement.appendChild(contents);
                         contentChanged = true;
                     } else {
-                        for (i = 0; (content = contents[i]); i++) {
+                        for (i = 0; contents && (content = contents[i]); i++) {
                             editorInnerElement.appendChild(content);
                             contentChanged = true;
                         }
diff --git a/node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor.css b/node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor.css
index 0248c63e..f5b00e84 100644
--- a/node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor.css
+++ b/node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor.css
@@ -12,12 +12,7 @@
 }
 
 .montage-editor {
-    position: absolute;
-    top: 0;
-    left: 0;
-    bottom: 0;
-    right: 0;
-
+    position: relative;
     outline:  none;
     overflow: auto;
 }
diff --git a/node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor.html b/node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor.html
index cd180dcc..9cebd32e 100644
--- a/node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor.html
+++ b/node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor.html
@@ -11,7 +11,7 @@
     <script type="text/montage-serialization">
         {
             "overlay": {
-                "prototype": "montage/ui/slot.reel",
+                "prototype": "ui/slot.reel",
                 "properties": {
                     "element": {"#": "editor-slot"},
                     "delegate": {"@": "owner"}
@@ -19,7 +19,7 @@
             },
 
             "owner": {
-                "prototype": "montage/ui/rich-text-editor/rich-text-editor.reel",
+                "prototype": "ui/rich-text-editor/rich-text-editor.reel",
                 "properties": {
                     "element": {"#": "rich-text-editor-container"},
                     "_overlaySlot": {"@": "overlay"}
diff --git a/node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor.js b/node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor.js
index 13ba0518..3665ca1b 100644
--- a/node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor.js
+++ b/node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor.js
@@ -27,7 +27,7 @@ The easiest way to create a RichTextEditor is with a serialization and a &lt;div
 <pre class="sh_javascript">
 {
 "editor": {
-   "prototype": "montage/ui/rich-text-editor/rich-text-editor.reel",
+   "prototype": "ui/rich-text-editor/rich-text-editor.reel",
    "properties": {
       "element": {"#": "editor" }
    }
@@ -649,13 +649,13 @@ exports.RichTextEditor = Montage.create(RichTextEditorBase,/** @lends module:"mo
                     clearTimeout(thisRef._updateValuesTimeout);
                     delete thisRef._updateValuesTimeout;
 
-                    if (defaultEventManager.registeredEventListenersForEventType_onTarget_("change@value", this)) {
+                    if (defaultEventManager.registeredEventListenersForEventType_onTarget_("change@value", thisRef)) {
                         prevValue = thisRef._value;
                         if (thisRef.value !== prevValue) {
                             thisRef.dispatchEvent(MutableEvent.changeEventForKeyAndValue("value" , prevValue).withPlusValue(thisRef.value));
                         }
                     }
-                    if (defaultEventManager.registeredEventListenersForEventType_onTarget_("change@textValue", this)) {
+                    if (defaultEventManager.registeredEventListenersForEventType_onTarget_("change@textValue", thisRef)) {
                         prevValue = thisRef._textValue;
                         if (thisRef.textValue !== prevValue) {
                             thisRef.dispatchEvent(MutableEvent.changeEventForKeyAndValue("textValue" , prevValue).withPlusValue(thisRef.textValue));
-- 
cgit v1.2.3