Permalink
Browse files

BUGFIX: add missing _super calls to all matchers and unmatchers

Otherwise some matchers might not be triggered as expected.
  • Loading branch information...
mateusz committed May 11, 2012
1 parent fb64cad commit b75483e1dab999ca8500e027a5a3f54edae9a104
Showing with 25 additions and 22 deletions.
  1. +19 −20 javascript/AssetAdmin.js
  2. +2 −1 javascript/CMSMain.AddForm.js
  3. +4 −1 javascript/ReportAdmin.Tree.js
View
@@ -3,26 +3,25 @@
*/
(function($) {
- /**
- * Delete selected folders through "batch actions" tab.
- */
- $(document).ready(function() {
- $('#Form_BatchActionsForm').entwine('ss').register(
- // TODO Hardcoding of base URL
- 'admin/assets/batchactions/delete',
- function(ids) {
- var confirmed = confirm(
- ss.i18n.sprintf(
- ss.i18n._t('AssetAdmin.BATCHACTIONSDELETECONFIRM'),
- ids.length
- )
- );
- return (confirmed) ? ids : false;
- }
- );
- });
-
$.entwine('ss', function($){
+ /**
+ * Delete selected folders through "batch actions" tab.
+ */
+ $(document).ready(function() {
+ $('#Form_BatchActionsForm').register(
+ // TODO Hardcoding of base URL
+ 'admin/assets/batchactions/delete',
+ function(ids) {
+ var confirmed = confirm(
+ ss.i18n.sprintf(
+ ss.i18n._t('AssetAdmin.BATCHACTIONSDELETECONFIRM'),
+ ids.length
+ )
+ );
+ return (confirmed) ? ids : false;
+ }
+ );
+ });
/**
* Load folder detail view via controller methods
@@ -120,4 +119,4 @@
}
});
});
-}(jQuery));
+}(jQuery));
@@ -46,6 +46,7 @@
self.updateTypeList();
});
this.updateTypeList();
+ this._super();
},
/**
@@ -106,4 +107,4 @@
}
});
});
-}(jQuery));
+}(jQuery));
@@ -14,8 +14,11 @@
var id = $('.cms-edit-form :input[name=ID]').val();
if (id) this[0].setCurrentByIdx(id);
+ this._super();
+ },
+ onunmatch: function() {
this._super();
}
});
});
-}(jQuery));
+}(jQuery));

0 comments on commit b75483e

Please sign in to comment.