Skip to content

Commit 0429532

Browse files
committed
Tabs: Removed cookie option. Fixes #7162 - Tabs: Remove cookie option.
1 parent 723d3e0 commit 0429532

File tree

5 files changed

+0
-178
lines changed

5 files changed

+0
-178
lines changed

external/jquery.cookie.js

Lines changed: 0 additions & 89 deletions
This file was deleted.

tests/unit/tabs/tabs_common_deprecated.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ TestHelpers.commonWidgetTests( "tabs", {
22
defaults: {
33
active: null,
44
collapsible: false,
5-
cookie: null,
65
disabled: false,
76
event: "click",
87
heightStyle: "content",

tests/unit/tabs/tabs_deprecated.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
<title>jQuery UI Tabs Test Suite</title>
66

77
<script src="../../jquery.js"></script>
8-
<script src="../../../external/jquery.cookie.js"></script>
98
<link rel="stylesheet" href="../../../external/qunit.css">
109
<script src="../../../external/qunit.js"></script>
1110
<script src="../../jquery.simulate.js"></script>

tests/unit/tabs/tabs_deprecated.js

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -66,41 +66,6 @@ test( "tabTemplate + panelTemplate", function() {
6666
ok( element.find( "#new" ).hasClass( "customPanel" ), "panel custom class" );
6767
});
6868

69-
test( "cookie", function() {
70-
expect( 6 );
71-
72-
var element = $( "#tabs1" ),
73-
cookieName = "tabs_test",
74-
cookieObj = { name: cookieName };
75-
$.cookie( cookieName, null );
76-
function cookie() {
77-
return parseInt( $.cookie( cookieName ), 10 );
78-
}
79-
80-
element.tabs({ cookie: cookieObj });
81-
equal( cookie(), 0, "initial cookie value" );
82-
83-
element.tabs( "destroy" );
84-
element.tabs({ active: 1, cookie: cookieObj });
85-
equal( cookie(), 1, "initial cookie value, from active property" );
86-
87-
element.tabs( "option", "active", 2 );
88-
equal( cookie(), 2, "cookie value updated after activating" );
89-
90-
element.tabs( "destroy" );
91-
$.cookie( cookieName, 1 );
92-
element.tabs({ cookie: cookieObj });
93-
equal( cookie(), 1, "initial cookie value, from existing cookie" );
94-
95-
element.tabs( "destroy" );
96-
element.tabs({ cookie: cookieObj, collapsible: true });
97-
element.tabs( "option", "active", false );
98-
equal( cookie(), -1, "cookie value for all tabs unselected" );
99-
100-
element.tabs( "destroy" );
101-
ok( $.cookie( cookieName ) === null, "erase cookie after destroy" );
102-
});
103-
10469
asyncTest( "spinner", function() {
10570
expect( 2 );
10671

ui/jquery.ui.tabs.js

Lines changed: 0 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1144,58 +1144,6 @@ if ( $.uiBackCompat !== false ) {
11441144
}
11451145
});
11461146

1147-
// cookie option
1148-
(function() {
1149-
1150-
var listId = 0;
1151-
1152-
$.widget( "ui.tabs", $.ui.tabs, {
1153-
options: {
1154-
cookie: null // e.g. { expires: 7, path: '/', domain: 'jquery.com', secure: true }
1155-
},
1156-
_create: function() {
1157-
var options = this.options,
1158-
active;
1159-
if ( options.active == null && options.cookie ) {
1160-
active = parseInt( this._cookie(), 10 );
1161-
if ( active === -1 ) {
1162-
active = false;
1163-
}
1164-
options.active = active;
1165-
}
1166-
this._super();
1167-
},
1168-
_cookie: function( active ) {
1169-
var cookie = [ this.cookie ||
1170-
( this.cookie = this.options.cookie.name || "ui-tabs-" + (++listId) ) ];
1171-
if ( arguments.length ) {
1172-
cookie.push( active === false ? -1 : active );
1173-
cookie.push( this.options.cookie );
1174-
}
1175-
return $.cookie.apply( null, cookie );
1176-
},
1177-
_refresh: function() {
1178-
this._super();
1179-
if ( this.options.cookie ) {
1180-
this._cookie( this.options.active, this.options.cookie );
1181-
}
1182-
},
1183-
_eventHandler: function() {
1184-
this._superApply( arguments );
1185-
if ( this.options.cookie ) {
1186-
this._cookie( this.options.active, this.options.cookie );
1187-
}
1188-
},
1189-
_destroy: function() {
1190-
this._super();
1191-
if ( this.options.cookie ) {
1192-
this._cookie( null, this.options.cookie );
1193-
}
1194-
}
1195-
});
1196-
1197-
})();
1198-
11991147
// load event
12001148
$.widget( "ui.tabs", $.ui.tabs, {
12011149
_trigger: function( type, event, data ) {

0 commit comments

Comments
 (0)