diff options
author | Armen Kesablyan | 2012-06-19 01:03:59 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-06-19 01:03:59 -0700 |
commit | 2e13a73e4ee980a6f73f6ff48b2a195eb209a7db (patch) | |
tree | d352f5e769eae0e1b7b76ccbeafa9b174b1a9918 /node_modules/montage/ui/rich-text-editor/rich-text-editor.reel | |
parent | 244e608645778746d1a3b5aa0d4c0868f7c5c272 (diff) | |
parent | c59eb371559a3061ce53223e249ca97daace5968 (diff) | |
download | ninja-2e13a73e4ee980a6f73f6ff48b2a195eb209a7db.tar.gz |
Merge branch 'refs/heads/master' into binding
Conflicts:
js/components/layout/tools-list.reel/tools-list.html
js/components/layout/tools-properties.reel/tools-properties.html
js/document/document-html.js
js/document/templates/app/main.js
js/panels/Panel.reel/Panel.js
node_modules/montage/ui/native-control.js
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'node_modules/montage/ui/rich-text-editor/rich-text-editor.reel')
4 files changed, 7 insertions, 12 deletions
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 | |||
593 | editorInnerElement.appendChild(contents); | 593 | editorInnerElement.appendChild(contents); |
594 | contentChanged = true; | 594 | contentChanged = true; |
595 | } else { | 595 | } else { |
596 | for (i = 0; (content = contents[i]); i++) { | 596 | for (i = 0; contents && (content = contents[i]); i++) { |
597 | editorInnerElement.appendChild(content); | 597 | editorInnerElement.appendChild(content); |
598 | contentChanged = true; | 598 | contentChanged = true; |
599 | } | 599 | } |
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 @@ | |||
12 | } | 12 | } |
13 | 13 | ||
14 | .montage-editor { | 14 | .montage-editor { |
15 | position: absolute; | 15 | position: relative; |
16 | top: 0; | ||
17 | left: 0; | ||
18 | bottom: 0; | ||
19 | right: 0; | ||
20 | |||
21 | outline: none; | 16 | outline: none; |
22 | overflow: auto; | 17 | overflow: auto; |
23 | } | 18 | } |
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 @@ | |||
11 | <script type="text/montage-serialization"> | 11 | <script type="text/montage-serialization"> |
12 | { | 12 | { |
13 | "overlay": { | 13 | "overlay": { |
14 | "prototype": "montage/ui/slot.reel", | 14 | "prototype": "ui/slot.reel", |
15 | "properties": { | 15 | "properties": { |
16 | "element": {"#": "editor-slot"}, | 16 | "element": {"#": "editor-slot"}, |
17 | "delegate": {"@": "owner"} | 17 | "delegate": {"@": "owner"} |
@@ -19,7 +19,7 @@ | |||
19 | }, | 19 | }, |
20 | 20 | ||
21 | "owner": { | 21 | "owner": { |
22 | "prototype": "montage/ui/rich-text-editor/rich-text-editor.reel", | 22 | "prototype": "ui/rich-text-editor/rich-text-editor.reel", |
23 | "properties": { | 23 | "properties": { |
24 | "element": {"#": "rich-text-editor-container"}, | 24 | "element": {"#": "rich-text-editor-container"}, |
25 | "_overlaySlot": {"@": "overlay"} | 25 | "_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 <div | |||
27 | <pre class="sh_javascript"> | 27 | <pre class="sh_javascript"> |
28 | { | 28 | { |
29 | "editor": { | 29 | "editor": { |
30 | "prototype": "montage/ui/rich-text-editor/rich-text-editor.reel", | 30 | "prototype": "ui/rich-text-editor/rich-text-editor.reel", |
31 | "properties": { | 31 | "properties": { |
32 | "element": {"#": "editor" } | 32 | "element": {"#": "editor" } |
33 | } | 33 | } |
@@ -649,13 +649,13 @@ exports.RichTextEditor = Montage.create(RichTextEditorBase,/** @lends module:"mo | |||
649 | clearTimeout(thisRef._updateValuesTimeout); | 649 | clearTimeout(thisRef._updateValuesTimeout); |
650 | delete thisRef._updateValuesTimeout; | 650 | delete thisRef._updateValuesTimeout; |
651 | 651 | ||
652 | if (defaultEventManager.registeredEventListenersForEventType_onTarget_("change@value", this)) { | 652 | if (defaultEventManager.registeredEventListenersForEventType_onTarget_("change@value", thisRef)) { |
653 | prevValue = thisRef._value; | 653 | prevValue = thisRef._value; |
654 | if (thisRef.value !== prevValue) { | 654 | if (thisRef.value !== prevValue) { |
655 | thisRef.dispatchEvent(MutableEvent.changeEventForKeyAndValue("value" , prevValue).withPlusValue(thisRef.value)); | 655 | thisRef.dispatchEvent(MutableEvent.changeEventForKeyAndValue("value" , prevValue).withPlusValue(thisRef.value)); |
656 | } | 656 | } |
657 | } | 657 | } |
658 | if (defaultEventManager.registeredEventListenersForEventType_onTarget_("change@textValue", this)) { | 658 | if (defaultEventManager.registeredEventListenersForEventType_onTarget_("change@textValue", thisRef)) { |
659 | prevValue = thisRef._textValue; | 659 | prevValue = thisRef._textValue; |
660 | if (thisRef.textValue !== prevValue) { | 660 | if (thisRef.textValue !== prevValue) { |
661 | thisRef.dispatchEvent(MutableEvent.changeEventForKeyAndValue("textValue" , prevValue).withPlusValue(thisRef.textValue)); | 661 | thisRef.dispatchEvent(MutableEvent.changeEventForKeyAndValue("textValue" , prevValue).withPlusValue(thisRef.textValue)); |