Skip to content
This repository has been archived by the owner on Oct 28, 2020. It is now read-only.

Commit

Permalink
Small naming fix
Browse files Browse the repository at this point in the history
  • Loading branch information
Stephen Hoogendijk committed Feb 3, 2014
1 parent 7b14fb0 commit 0bcfd50
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
18 changes: 9 additions & 9 deletions js/bootstrap-remote-tabs.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ var RemoteTabs = function() {
me.hasLoadingMask = !!hasLoadingMask;

// enable all remote data tabs
$('[data-toggle=tab], [data-toggle=collapse]').each(function(k, tab) {
var bsObj = $(tab),
$('[data-toggle=tab], [data-toggle=collapse]').each(function(k, obj) {
var bsObj = $(obj),
bsDiv,
bsData,
bsCallback,
Expand Down Expand Up @@ -164,10 +164,10 @@ var RemoteTabs = function() {
* @param customData
* @param callbackFn
* @param trigger
* @param tabContainer
* @param dataContainer
* @private
*/
_executeRemoteCall: function(url, customData, callbackFn, trigger, tabContainer) {
_executeRemoteCall: function(url, customData, callbackFn, trigger, dataContainer) {
var me = this;


Expand All @@ -177,23 +177,23 @@ var RemoteTabs = function() {
success: function(data) {
trigger.removeClass('loading');
if(me.hasLoadingMask) {
tabContainer.unmask();
dataContainer.unmask();
}
if (data) {
if(typeof window[callbackFn] == 'function') {
window[callbackFn].call(null, data, trigger, tabContainer, customData);
window[callbackFn].call(null, data, trigger, dataContainer, customData);
}
if(!trigger.hasClass("loaded")) {
trigger.addClass("loaded");
}
tabContainer.html(data);
dataContainer.html(data);
}
},
error: function(data, status, error) {
tabContainer.html("An error occured while loading the data: " + error);
dataContainer.html("An error occured while loading the data: " + error);
trigger.removeClass('loading');
if(me.hasLoadingMask) {
tabContainer.unmask();
dataContainer.unmask();
}
}
});
Expand Down
2 changes: 1 addition & 1 deletion js/bootstrap-remote-tabs.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 0bcfd50

Please sign in to comment.