Merge branch 'refs/heads/master' into binding

Conflicts:
	node_modules/montage/ui/application.js

Signed-off-by: Armen Kesablyan <armen@motorola.com>

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
                 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),