From 8fe92b94ce5e1e2857d088752d94e19db7e3d8a8 Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Sun, 17 Jun 2012 22:31:44 -0700 Subject: montage v11 merge into ninja Signed-off-by: Valerio Virgillito --- .../rich-text-linkpopup.html | 34 +++++++++++----------- .../rich-text-resizer.reel/rich-text-resizer.html | 32 ++++++++++---------- .../rich-text-resizer.reel/rich-text-resizer.js | 2 +- 3 files changed, 34 insertions(+), 34 deletions(-) (limited to 'node_modules/montage/ui/rich-text-editor/overlays') 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 9595d7ab..9bb4b0df 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 @@ -6,25 +6,25 @@ --> - - + + @@ -32,4 +32,4 @@ - + \ No newline at end of file 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 526d6563..d7dbe11c 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 @@ -6,25 +6,25 @@ --> - - + + diff --git a/node_modules/montage/ui/rich-text-editor/overlays/rich-text-resizer.reel/rich-text-resizer.js b/node_modules/montage/ui/rich-text-editor/overlays/rich-text-resizer.reel/rich-text-resizer.js index c9f94565..2b0fa5c0 100644 --- a/node_modules/montage/ui/rich-text-editor/overlays/rich-text-resizer.reel/rich-text-resizer.js +++ b/node_modules/montage/ui/rich-text-editor/overlays/rich-text-resizer.reel/rich-text-resizer.js @@ -231,7 +231,7 @@ exports.RichTextResizer = Montage.create(Component,/** @lends module:"montage/ui var zero = Point.create().init(0, 0), framePosition = dom.convertPointFromNodeToPage(element, zero), cursor = this._cursorPosition, - direction = this._draggedElement.id.substring("montage-resizer-handle-".length), + direction = this._draggedElement.getAttribute("data-montage-id").substring("montage-resizer-handle-".length), info = this._resizerFrameInfo, ratio = info.ratio, height = parseFloat(element.style.height, 10), -- cgit v1.2.3