Merge pull request #2444 from vogdb/issue-2444

reload of popOut Component.
cargomedia · Dec 7, 2016 · b4d9f77 · b4d9f77
2 parents 5dc2d63 + 6fb1e63
commit b4d9f77
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/client-vendor/after-body/jquery.floatbox/jquery.floatbox.js b/client-vendor/after-body/jquery.floatbox/jquery.floatbox.js
@@ -105,6 +105,7 @@
       if (this.$parent.length) {
         this.$parent.append($element);
       }
+      this.$floatbox.trigger('floatbox-close');
       $element.removeData('floatbox');
       this.$layer.remove();
       $viewport.children('.floatbox-layer:last').addClass('active');

diff --git a/library/CM/Component/Abstract.js b/library/CM/Component/Abstract.js
@@ -42,18 +42,23 @@ var CM_Component_Abstract = CM_View_Abstract.extend({
     return $(selector, this.el);
   },
 
-  popOut: function(options) {
+  /**
+   * @param {Object} [options]
+   * @param {Boolean} [removeOnClose]
+   */
+  popOut: function(options, removeOnClose) {
     this.repaint();
-    this.$el.floatbox(options);
+    //we don't use `this.$el.floatbox(options);` cause `this` component can be reloaded.
+    var floatbox = new $.floatbox(options);
+    floatbox.show(this.$el);
     this.repaint();
 
-    var self = this;
-    this.$el.one('floatbox-close', function() {
-      if (cm.window.isHidden(self.el)) {
+    if (removeOnClose) {
+      var self = this;
+      floatbox.$floatbox.one('floatbox-close', function() {
         self.remove();
-      }
-      return false;
-    });
+      });
+    }
   },
 
   popIn: function() {

diff --git a/library/CM/View/Abstract.js b/library/CM/View/Abstract.js
@@ -341,7 +341,7 @@ var CM_View_Abstract = Backbone.View.extend({
   popOutComponent: function(className, params, options) {
     return this.prepareComponent(className, params, options)
       .then(function(component) {
-        component.popOut();
+        component.popOut({}, true);
         return component;
       });
   },