Skip to content
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

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion client/dist/js/bundle.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion client/dist/js/vendor.js

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions client/dist/styles/bundle.css

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions client/src/legacy/LeftAndMain.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Member Author

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'


// 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')});
Copy link
Member Author

Choose a reason for hiding this comment

The 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) {
Expand Down Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions client/src/legacy/TabSet.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ $.entwine('ss', function($){
const tabsetId = this.attr('id');
const forcedTab = this.children('ul').children('li.ss-tabs-force-active');

if (!this.data('tabs')) {
if (!this.data('uiTabs')) {
// Defer until tabs have been initialised in redrawTabs()
this.setDeferRestoreState(true);
this.setDefferredStateOverride(overrideState);
Expand Down Expand Up @@ -164,7 +164,7 @@ $.entwine('ss', function($){
},

onremove: function() {
if(this.data('tabs')) this.tabs('destroy');
if(this.data('uiTabs')) this.tabs('destroy');
this._super();
},

Expand Down
2 changes: 1 addition & 1 deletion client/src/legacy/ToggleCompositeField.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ $.entwine('ss', function($){
});
},
onremove: function() {
if (this.data('accordion')) this.accordion('destroy');
if (this.data('uiAccordion')) this.accordion('destroy');
this._super();
},

Expand Down
5 changes: 5 additions & 0 deletions client/src/styles/legacy/_forms.scss
Original file line number Diff line number Diff line change
Expand Up @@ -538,6 +538,7 @@ button.loading {
padding-top: $spacer * .75;
padding-bottom: $spacer * .75;
border-radius: $border-radius-sm;
padding-left: $spacer * 1.75;

&.ui-state-default {
background: $body-bg-dark;
Expand All @@ -549,7 +550,11 @@ button.loading {
}

.ui-accordion-header-icon {
position: absolute;
left: .5em;
top: 50%;
margin-top: -9px;
background-image: url("../../../../thirdparty/jquery-ui-themes/smoothness/images/ui-icons_444444_256x240.png");
}
}

Expand Down
17 changes: 16 additions & 1 deletion client/src/styles/legacy/_uitheme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Copy link
Member Author

Choose a reason for hiding this comment

The 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 {
Expand Down Expand Up @@ -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;
Expand All @@ -83,3 +92,9 @@
background-size: auto !important;
}
}

.ui-tabs .ui-tabs-nav .ui-tabs-anchor {
float: none;
padding: $nav-link-padding;
cursor: pointer;
}
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading