Browse Source

Remove $.proxy calls from visibility and accordion

pull/1615/head
jlukic 10 years ago
parent
commit
be617dacd3
2 changed files with 14 additions and 14 deletions
  1. 6
      src/definitions/behaviors/visibility.js
  2. 22
      src/definitions/modules/accordion.js

6
src/definitions/behaviors/visibility.js

@ -241,7 +241,7 @@ $.fn.visibility = function(parameters) {
module.reset(); module.reset();
module.save.position(); module.save.position();
module.checkVisibility(); module.checkVisibility();
$.proxy(settings.onRefresh, element)();
settings.onRefresh.call(element);
}, },
reset: function() { reset: function() {
@ -529,11 +529,11 @@ $.fn.visibility = function(parameters) {
if(callback) { if(callback) {
if(settings.continuous) { if(settings.continuous) {
module.debug('Callback being called continuously', callbackName, calculations); module.debug('Callback being called continuously', callbackName, calculations);
$.proxy(callback, element)(calculations, screen);
callback.call(element, calculations, screen);
} }
else if(!module.get.occurred(callbackName)) { else if(!module.get.occurred(callbackName)) {
module.debug('Conditions met', callbackName, calculations); module.debug('Conditions met', callbackName, calculations);
$.proxy(callback, element)(calculations, screen);
callback.call(element, calculations, screen);
} }
} }
module.save.occurred(callbackName); module.save.occurred(callbackName);

22
src/definitions/modules/accordion.js

@ -108,7 +108,7 @@ $.fn.accordion = function(parameters) {
event: { event: {
click: function() { click: function() {
$.proxy(module.toggle, this)();
module.toggle.call(this);
} }
}, },
@ -125,14 +125,14 @@ $.fn.accordion = function(parameters) {
module.debug('Toggling visibility of content', $activeTitle); module.debug('Toggling visibility of content', $activeTitle);
if(contentIsOpen) { if(contentIsOpen) {
if(settings.collapsible) { if(settings.collapsible) {
$.proxy(module.close, $activeTitle)();
module.close.call($activeTitle);
} }
else { else {
module.debug('Cannot close accordion content collapsing is disabled'); module.debug('Cannot close accordion content collapsing is disabled');
} }
} }
else { else {
$.proxy(module.open, $activeTitle)();
module.open.call($activeTitle);
} }
}, },
@ -150,7 +150,7 @@ $.fn.accordion = function(parameters) {
if(!currentlyAnimating && !currentlyActive) { if(!currentlyAnimating && !currentlyActive) {
module.debug('Opening accordion content', $activeTitle); module.debug('Opening accordion content', $activeTitle);
if(settings.exclusive) { if(settings.exclusive) {
$.proxy(module.closeOthers, $activeTitle)();
module.closeOthers.call($activeTitle);
} }
$activeTitle $activeTitle
.addClass(className.active) .addClass(className.active)
@ -184,9 +184,9 @@ $.fn.accordion = function(parameters) {
$activeContent $activeContent
.addClass(className.active) .addClass(className.active)
; ;
$.proxy(module.reset.display, this)();
$.proxy(settings.onOpen, this)();
$.proxy(settings.onChange, this)();
module.reset.display.call(this);
settings.onOpen.call(this);
settings.onChange.call(this);
}) })
; ;
} }
@ -237,9 +237,9 @@ $.fn.accordion = function(parameters) {
$activeContent $activeContent
.stop() .stop()
.slideUp(settings.duration, settings.easing, function() { .slideUp(settings.duration, settings.easing, function() {
$.proxy(module.reset.display, this)();
$.proxy(settings.onClose, this)();
$.proxy(settings.onChange, this)();
module.reset.display.call(this);
settings.onClose.call(this);
settings.onChange.call(this);
}) })
; ;
} }
@ -300,7 +300,7 @@ $.fn.accordion = function(parameters) {
.stop() .stop()
.slideUp(settings.duration , settings.easing, function() { .slideUp(settings.duration , settings.easing, function() {
$(this).removeClass(className.active); $(this).removeClass(className.active);
$.proxy(module.reset.display, this)();
module.reset.display.call(this);
}) })
; ;
} }

Loading…
Cancel
Save