From 32afc6f4511d2bf24a5cbb541ae0173473aec668 Mon Sep 17 00:00:00 2001
From: Narciso Jaramillo <njaramil@adobe.com>
Date: Tue, 18 Dec 2012 15:05:36 -0800
Subject: [PATCH] Ensure inline widgets are scrolled to be fully visible when
 opened, and ensure cursor within inline widget remains visible on selection
 change

---
 src/editor/Editor.js                 | 11 ++++++++++-
 src/editor/MultiRangeInlineEditor.js | 20 +++++++++-----------
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/editor/Editor.js b/src/editor/Editor.js
index 77d072c87d1..fcdb29fe87d 100644
--- a/src/editor/Editor.js
+++ b/src/editor/Editor.js
@@ -959,8 +959,17 @@ define(function (require, exports, module) {
         var node = inlineWidget.htmlContent,
             oldHeight = (node && $(node).height()) || 0;
         
-        // TODO: handle ensureVisible
         $(node).height(height);
+        if (ensureVisible) {
+            var offset = $(node).offset(),
+                lineSpaceOffset = $(this._getLineSpaceElement()).offset();
+            this._codeMirror.scrollIntoView({
+                left: offset.left - lineSpaceOffset.left,
+                top: offset.top - lineSpaceOffset.top,
+                right: offset.left - lineSpaceOffset.left, // don't try to make the right edge visible
+                bottom: offset.top + height - lineSpaceOffset.top
+            });
+        }
         
         // update position for all following inline editors
         if (oldHeight !== height) {
diff --git a/src/editor/MultiRangeInlineEditor.js b/src/editor/MultiRangeInlineEditor.js
index cf16d43aa03..37e4fc7e0cb 100644
--- a/src/editor/MultiRangeInlineEditor.js
+++ b/src/editor/MultiRangeInlineEditor.js
@@ -425,7 +425,7 @@ define(function (require, exports, module) {
     MultiRangeInlineEditor.prototype._ensureCursorVisible = function () {
         if ($.contains(this.editors[0].getRootElement(), window.document.activeElement)) {
             var cursorCoords = this.editors[0]._codeMirror.cursorCoords(),
-                lineSpaceOffset = $(this.editors[0]._getLineSpaceElement()).offset(),
+                inlineLineSpaceOffset = $(this.editors[0]._getLineSpaceElement()).offset(),
                 rangeListOffset = this.$relatedContainer.offset();
             // If we're off the left-hand side, we just want to scroll it into view normally. But
             // if we're underneath the range list on the right, we want to ask the host editor to 
@@ -436,16 +436,14 @@ define(function (require, exports, module) {
             }
             
             // Vertically, we want to set the scroll position relative to the overall host editor, not
-            // the lineSpace of the widget itself. Also, we can't use the lineSpace here, because its top
-            // position just corresponds to whatever CodeMirror happens to have rendered at the top. So
-            // we need to figure out our position relative to the top of the virtual scroll area, which is
-            // the top of the actual scroller minus the scroll position.
-            var scrollerTop = $(this.hostEditor.getScrollerElement()).offset().top - this.hostEditor.getScrollPos().y;
-            // TODO: [cmv3] scrollIntoView isn't implemented yet
-//            this.hostEditor._codeMirror.scrollIntoView(cursorCoords.left - lineSpaceOffset.left,
-//                                                       cursorCoords.top - scrollerTop,
-//                                                       cursorCoords.left - lineSpaceOffset.left,
-//                                                       cursorCoords.bottom - scrollerTop);
+            // the lineSpace of the widget itself.
+            var hostLineSpaceTop = $(this.hostEditor._getLineSpaceElement()).offset().top;
+            this.hostEditor._codeMirror.scrollIntoView({
+                left: cursorCoords.left - inlineLineSpaceOffset.left,
+                top: cursorCoords.top - hostLineSpaceTop,
+                right: cursorCoords.left - inlineLineSpaceOffset.left,
+                bottom: cursorCoords.bottom - hostLineSpaceTop
+            });
         }
     };