Merge branch 'release-2.3'

themes/bootstrap/js/cart.js

@@ -249,7 +249,7 @@ $(document).ready(function() {
     });
     return false;
   });
-  Lightbox.addCloseAction(function() {
+  $('#modal').on('hidden', function(e) {
     // Update cart items (add to cart, remove from cart, cart lightbox interface)
     var cartCount = $('#cartItems strong');
     if(cartCount.length > 0) {

themes/bootstrap/js/lightbox.js

@@ -13,7 +13,6 @@ var Lightbox = {
   XHR: false,        // Used for current in-progress XHR lightbox request
   openStack: [],     // Array of functions to be called after changeContent or the lightbox event 'shown'
   closeStack: [],    // Array of functions to be called and cleared after the lightbox event 'hidden'
-  closeStackPerm: [],// Array of functions to be called after the lightbox event 'hidden'
   formHandlers: [],  // Full custom handlers for forms; by name
   formCallbacks: [], // Custom functions for forms, called after .submit(); by name
 
@@ -45,12 +44,6 @@ var Lightbox = {
   addCloseAction: function(func) {
     this.closeStack.push(func);
   },
-  /**
-   * Register permanent close event handlers
-   */
-  addPermanentCloseAction: function(func) {
-    this.closeStackPerm.push(func);
-  },
   /**
    * For when you want to handle that form all by yourself
    *

themes/bootstrap3/js/cart.js

@@ -249,7 +249,7 @@ $(document).ready(function() {
     });
     return false;
   });
-  Lightbox.addPermanentCloseAction(function() {
+  $('#modal').on('hidden.bs.modal', function() {
     // Update cart items (add to cart, remove from cart, cart lightbox interface)
     var cartCount = $('#cartItems strong');
     if(cartCount.length > 0) {

themes/bootstrap3/js/lightbox.js

@@ -13,7 +13,6 @@ var Lightbox = {
   XHR: false,        // Used for current in-progress XHR lightbox request
   openStack: [],     // Array of functions to be called after changeContent or the lightbox event 'shown'
   closeStack: [],    // Array of functions to be called and cleared after the lightbox event 'hidden'
-  closeStackPerm: [],// Array of functions to be called after the lightbox event 'hidden'
   formHandlers: [],  // Full custom handlers for forms; by name
   formCallbacks: [], // Custom functions for forms, called after .submit(); by name
 
@@ -45,12 +44,6 @@ var Lightbox = {
   addCloseAction: function(func) {
     this.closeStack.push(func);
   },
-  /**
-   * Register permanent close event handlers
-   */
-  addPermanentCloseAction: function(func) {
-    this.closeStackPerm.push(func);
-  },
   /**
    * For when you want to handle that form all by yourself
    *
@@ -134,10 +127,6 @@ var Lightbox = {
   closeActions: function() {
     Lightbox.shown = false;
     Lightbox.openingURL = false;
-    // permanent close actions
-    for(var i=Lightbox.closeStackPerm.length;i--;) {
-      Lightbox.closeStackPerm[i]();
-    }
     // Clean out stack
     while(Lightbox.closeStack.length > 0) {
       var f = Lightbox.closeStack.pop();