FIX: toolbar float bug #341

gtzhong · Nov 9, 2015 · 485c496 · 485c496
1 parent b1e07e3
commit 485c496
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 14 deletions.
diff --git a/lib/simditor.js b/lib/simditor.js
@@ -1,8 +1,3 @@
-/*!
-* Simditor v2.3.4
-* http://simditor.tower.im/
-* 2015-10-28
-*/
 (function (root, factory) {
   if (typeof define === 'function' && define.amd) {
     // AMD. Register as an anonymous module unless amdModuleId is set
@@ -1918,11 +1913,10 @@ Toolbar = (function(superClass) {
           return true;
         };
       })(this);
+      floatInitialized = null;
       $(window).on('resize.simditor-' + this.editor.id, function(e) {
-        var floatInitialized;
-        return floatInitialized = null;
+        return floatInitialized = initToolbarFloat();
       });
-      floatInitialized = null;
       $(window).on('scroll.simditor-' + this.editor.id, (function(_this) {
         return function(e) {
           var bottomEdge, scrollTop, topEdge;

diff --git a/site/assets/scripts/simditor.js b/site/assets/scripts/simditor.js
@@ -1913,11 +1913,10 @@ Toolbar = (function(superClass) {
           return true;
         };
       })(this);
+      floatInitialized = null;
       $(window).on('resize.simditor-' + this.editor.id, function(e) {
-        var floatInitialized;
-        return floatInitialized = null;
+        return floatInitialized = initToolbarFloat();
       });
-      floatInitialized = null;
       $(window).on('scroll.simditor-' + this.editor.id, (function(_this) {
         return function(e) {
           var bottomEdge, scrollTop, topEdge;

diff --git a/src/toolbar.coffee b/src/toolbar.coffee
@@ -51,10 +51,10 @@ class Toolbar extends SimpleModule
         @editor.placeholderEl.css 'top', toolbarHeight
         true
 
+      floatInitialized = null
       $(window).on 'resize.simditor-' + @editor.id, (e) ->
-        floatInitialized = null
+        floatInitialized = initToolbarFloat()
 
-      floatInitialized = null
       $(window).on 'scroll.simditor-' + @editor.id, (e) =>
         return unless @wrapper.is(':visible')
         topEdge = @editor.wrapper.offset().top

diff --git a/styles/simditor.css b/styles/simditor.css
@@ -1,7 +1,7 @@
 /*!
 * Simditor v2.3.4
 * http://simditor.tower.im/
-* 2015-10-28
+* 2015-11-09
 */
 @font-face {
   font-family: 'Simditor';