append popovers to simditor el instead of wrapper

ircoco · Sep 15, 2014 · a32c570 · a32c570
1 parent 8da1f47
commit a32c570
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 28 deletions.
diff --git a/lib/simditor-all.js b/lib/simditor-all.js
diff --git a/lib/simditor.js b/lib/simditor.js
diff --git a/site/assets/scripts/simditor-all.js b/site/assets/scripts/simditor-all.js
diff --git a/src/buttons/popover.coffee b/src/buttons/popover.coffee
@@ -11,7 +11,7 @@ class Popover extends Module
 
   constructor: (@editor) ->
     @el = $('<div class="simditor-popover"></div>')
-      .appendTo(@editor.wrapper)
+      .appendTo(@editor.el)
       .data('popover', @)
     @render()
 
@@ -56,16 +56,16 @@ class Popover extends Module
 
   refresh: (position = 'bottom') ->
     return unless @active
-    wrapperOffset = @editor.wrapper.offset()
+    editorOffset = @editor.el.offset()
     targetOffset = @target.offset()
     targetH = @target.outerHeight()
 
     if position is 'bottom'
-      top = targetOffset.top - wrapperOffset.top + targetH
+      top = targetOffset.top - editorOffset.top + targetH
     else if position is 'top'
-      top = targetOffset.top - wrapperOffset.top - @el.height()
+      top = targetOffset.top - editorOffset.top - @el.height()
 
-    left = Math.min(targetOffset.left - wrapperOffset.left, @editor.wrapper.width() - @el.outerWidth() - 10)
+    left = Math.min(targetOffset.left - editorOffset.left, @editor.wrapper.width() - @el.outerWidth() - 10)
 
     @el.css({
       top: top + @offset.top,

diff --git a/src/simditor.coffee b/src/simditor.coffee
@@ -1956,7 +1956,7 @@ class Popover extends Module
 
   constructor: (@editor) ->
     @el = $('<div class="simditor-popover"></div>')
-      .appendTo(@editor.wrapper)
+      .appendTo(@editor.el)
       .data('popover', @)
     @render()
 
@@ -2001,16 +2001,16 @@ class Popover extends Module
 
   refresh: (position = 'bottom') ->
     return unless @active
-    wrapperOffset = @editor.wrapper.offset()
+    editorOffset = @editor.el.offset()
     targetOffset = @target.offset()
     targetH = @target.outerHeight()
 
     if position is 'bottom'
-      top = targetOffset.top - wrapperOffset.top + targetH
+      top = targetOffset.top - editorOffset.top + targetH
     else if position is 'top'
-      top = targetOffset.top - wrapperOffset.top - @el.height()
+      top = targetOffset.top - editorOffset.top - @el.height()
 
-    left = Math.min(targetOffset.left - wrapperOffset.left, @editor.wrapper.width() - @el.outerWidth() - 10)
+    left = Math.min(targetOffset.left - editorOffset.left, @editor.wrapper.width() - @el.outerWidth() - 10)
 
     @el.css({
       top: top + @offset.top,