summaryrefslogtreecommitdiff
path: root/jarmon
diff options
context:
space:
mode:
authorRichard Wall <richard@largo>2011-09-11 10:44:14 +0100
committerRichard Wall <richard@largo>2011-09-11 10:44:14 +0100
commit4a41ade5990aae01e2ed39404ea5d2d12ce6bcae (patch)
tree66dab70f847039f2a56faec154d9de51bcfd389e /jarmon
parent717d4eb9d9416f84f06a198534b093aae8a494fe (diff)
parent500789c2c6f59f81cc579c4164f6ebfd3890885d (diff)
Merge lp:~richardw/jarmon/tab-history-816668HEADmaster
* #816668 Upgrade to latest dev jquerytools and re-enable the tab history plugin * Upgrade to jquery 1.6.3
Diffstat (limited to 'jarmon')
-rw-r--r--jarmon/jarmon.js3
1 files changed, 1 insertions, 2 deletions
diff --git a/jarmon/jarmon.js b/jarmon/jarmon.js
index 32fce6d..e4fd1dc 100644
--- a/jarmon/jarmon.js
+++ b/jarmon/jarmon.js
@@ -1229,10 +1229,9 @@ jarmon.TabbedInterface.prototype.setup = function() {
if(api) {
api.destroy();
}
- this.$tabBar.tabs(this.$tabPanels.children('div'));
+ this.$tabBar.tabs(this.$tabPanels.children('div'), {history: true});
};
-
jarmon.buildTabbedChartUi = function ($chartTemplate, chartRecipes,
$tabTemplate, tabRecipes,
$controlPanelTemplate) {