aboutsummaryrefslogtreecommitdiff
path: root/node_modules/montage/ui/rich-text-editor/overlays/rich-text-resizer.reel/rich-text-resizer.js
diff options
context:
space:
mode:
authorJonathan Duran2012-06-20 15:04:45 -0700
committerJonathan Duran2012-06-20 15:04:45 -0700
commitc6ae80c488621d4ac189cb63309b6258115f823a (patch)
treedfa26112e1830972fcb212bbb5b17c9a901c645f /node_modules/montage/ui/rich-text-editor/overlays/rich-text-resizer.reel/rich-text-resizer.js
parent022e714cb5d10cd8575ab9907eddfb184a990b66 (diff)
parentc9852665eadc1acb9c1c881d207c4bd9ef88805f (diff)
downloadninja-c6ae80c488621d4ac189cb63309b6258115f823a.tar.gz
Merge branch 'refs/heads/NINJAmaster' into Timeline-merge-candidate
Diffstat (limited to 'node_modules/montage/ui/rich-text-editor/overlays/rich-text-resizer.reel/rich-text-resizer.js')
-rw-r--r--node_modules/montage/ui/rich-text-editor/overlays/rich-text-resizer.reel/rich-text-resizer.js2
1 files changed, 1 insertions, 1 deletions
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
231 var zero = Point.create().init(0, 0), 231 var zero = Point.create().init(0, 0),
232 framePosition = dom.convertPointFromNodeToPage(element, zero), 232 framePosition = dom.convertPointFromNodeToPage(element, zero),
233 cursor = this._cursorPosition, 233 cursor = this._cursorPosition,
234 direction = this._draggedElement.id.substring("montage-resizer-handle-".length), 234 direction = this._draggedElement.getAttribute("data-montage-id").substring("montage-resizer-handle-".length),
235 info = this._resizerFrameInfo, 235 info = this._resizerFrameInfo,
236 ratio = info.ratio, 236 ratio = info.ratio,
237 height = parseFloat(element.style.height, 10), 237 height = parseFloat(element.style.height, 10),