-
Notifications
You must be signed in to change notification settings - Fork 96
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
DEP Update jquery-ui in thirdparty folder #1424
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -889,12 +889,12 @@ $.entwine('ss', function($) { | |
this.find('.cms-tabset,.ss-tabset').each(function(i, el) { | ||
var id = $(el).attr('id'); | ||
if(!id) return; // we need a unique reference | ||
if(!$(el).data('tabs')) return; // don't act on uninit'ed controls | ||
if(!$(el).data('uiTabs')) return; // don't act on uninit'ed controls | ||
|
||
// Allow opt-out via data element or entwine property. | ||
if($(el).data('ignoreTabState') || $(el).getIgnoreTabState()) return; | ||
|
||
selectedTabs.push({id:id, selected:$(el).tabs('option', 'selected')}); | ||
selectedTabs.push({id:id, selected:$(el).tabs('option', 'active')}); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 'selected' was renamed to 'active' - https://bugs.jqueryui.com/ticket/7135 |
||
}); | ||
|
||
if(selectedTabs) { | ||
|
@@ -1318,15 +1318,15 @@ $.entwine('ss', function($) { | |
this._super(); | ||
}, | ||
onremove: function() { | ||
if (this.data('tabs')) this.tabs('destroy'); | ||
if (this.data('uiTabs')) this.tabs('destroy'); | ||
this._super(); | ||
}, | ||
redrawTabs: function() { | ||
this.rewriteHashlinks(); | ||
|
||
var id = this.attr('id'), activeTab = this.find('ul:first .ui-tabs-active'); | ||
|
||
if(!this.data('tabs')) this.tabs({ | ||
if(!this.data('uiTabs')) this.tabs({ | ||
active: (activeTab.index() != -1) ? activeTab.index() : 0, | ||
beforeLoad: function(e, ui) { | ||
// Disable automatic ajax loading of tabs without matching DOM elements, | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -16,10 +16,15 @@ | |
} | ||
|
||
.ui-widget-content, | ||
.ui-widget { | ||
.ui-widget, | ||
.ui-widget.ui-widget-content { | ||
color: $body-color; | ||
font-size: 1em; | ||
border: 0; | ||
|
||
a { | ||
color: $link-color; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. These CSS changes are effectively to revert some CSS additions that went into later versions of jquery-ui |
||
} | ||
} | ||
|
||
.ui-widget-header { | ||
|
@@ -63,6 +68,10 @@ | |
.ui-accordion-header { | ||
border-color: $btn-secondary-border; | ||
margin-bottom: 0; | ||
|
||
a { | ||
color: $gray-700; | ||
} | ||
} | ||
.ui-accordion-content { | ||
border: 1px solid $btn-secondary-border; | ||
|
@@ -83,3 +92,9 @@ | |
background-size: auto !important; | ||
} | ||
} | ||
|
||
.ui-tabs .ui-tabs-nav .ui-tabs-anchor { | ||
float: none; | ||
padding: $nav-link-padding; | ||
cursor: pointer; | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
'tabs' was renamed to 'uiTabs' in jquery-ui 1.10 - I couldn't find a reference of where this was done, though console.log'ing
$el.data()
showed it to now be'uiTabs'