Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Build: Use a single SHA for all jQuery UI files

Closes gh-7497
  • Loading branch information...
commit 26798b550618bfe0b2966308b5fab1668af4b91f 1 parent 14c712f
@scottgonzalez scottgonzalez authored
View
20 Gruntfile.js
@@ -935,23 +935,9 @@ module.exports = function( grunt ) {
},
files: {
"jquery-ui/jquery.ui.core.js": "jquery-ui/ui/jquery.ui.core.js",
- "jquery-ui/jquery.ui.widget.js": "jquery-ui/ui/jquery.ui.widget.js"
- }
- },
- "jquery-ui-tabs": {
- options: {
- copyOptions: {
- process: function( content ) {
- var version = grunt.file.readJSON( "bower.json" ).dependencies[ "jquery-ui-tabs" ];
- if ( /#/.test( version ) ) {
- version = version.split( "#" )[ 1 ];
- }
- return content.replace( /@VERSION/g, version );
- }
- }
- },
- files: {
- "jquery-ui/jquery.ui.tabs.js": "jquery-ui-tabs/ui/jquery.ui.tabs.js"
+ "jquery-ui/jquery.ui.widget.js": "jquery-ui/ui/jquery.ui.widget.js",
+ "jquery-ui/jquery.ui.tabs.js": "jquery-ui/ui/jquery.ui.tabs.js",
+ "jquery-ui/MIT-LICENSE.txt": "jquery-ui/MIT-LICENSE.txt"
}
},
"jquery-plugins": {
View
1  bower.json
@@ -16,7 +16,6 @@
"dependencies": {
"jquery": "1.11.1",
"jquery-ui": "jquery/jquery-ui#c0ab71056b936627e8a7821f03c044aec6280a40",
- "jquery-ui-tabs": "jquery/jquery-ui#fadf2b312a05040436451c64bbfaf4814bc62c56",
"jquery-hashchange": "gseguin/jquery-hashchange#2da0c56fd418fa323c136254f971b6176f1ae135"
},
"devDependencies": {
View
26 external/jquery-ui/MIT-LICENSE.txt
@@ -0,0 +1,26 @@
+Copyright 2013 jQuery Foundation and other contributors,
+http://jqueryui.com/
+
+This software consists of voluntary contributions made by many
+individuals (AUTHORS.txt, http://jqueryui.com/about) For exact
+contribution history, see the revision history and logs, available
+at http://jquery-ui.googlecode.com/svn/
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
View
20 external/jquery-ui/jquery.ui.tabs.js
@@ -1,5 +1,5 @@
/*!
- * jQuery UI Tabs fadf2b312a05040436451c64bbfaf4814bc62c56
+ * jQuery UI Tabs c0ab71056b936627e8a7821f03c044aec6280a40
* http://jqueryui.com
*
* Copyright 2013 jQuery Foundation and other contributors
@@ -22,13 +22,17 @@ function getNextTabId() {
}
function isLocal( anchor ) {
+ // support: IE7
+ // IE7 doesn't normalize the href property when set via script (#9317)
+ anchor = anchor.cloneNode( false );
+
return anchor.hash.length > 1 &&
decodeURIComponent( anchor.href.replace( rhash, "" ) ) ===
decodeURIComponent( location.href.replace( rhash, "" ) );
}
$.widget( "ui.tabs", {
- version: "fadf2b312a05040436451c64bbfaf4814bc62c56",
+ version: "c0ab71056b936627e8a7821f03c044aec6280a40",
delay: 300,
options: {
active: null,
@@ -473,11 +477,7 @@ $.widget( "ui.tabs", {
},
_setupEvents: function( event ) {
- var events = {
- click: function( event ) {
- event.preventDefault();
- }
- };
+ var events = {};
if ( event ) {
$.each( event.split(" "), function( index, eventName ) {
events[ eventName ] = "_eventHandler";
@@ -485,6 +485,12 @@ $.widget( "ui.tabs", {
}
this._off( this.anchors.add( this.tabs ).add( this.panels ) );
+ // Always prevent the default action, even when disabled
+ this._on( true, this.anchors, {
+ click: function( event ) {
+ event.preventDefault();
+ }
+ });
this._on( this.anchors, events );
this._on( this.tabs, { keydown: "_tabKeydown" } );
this._on( this.panels, { keydown: "_panelKeydown" } );
Please sign in to comment.
Something went wrong with that request. Please try again.