Permalink
Browse files

Build: Move all external libraries to external directory

Closes gh-1593

Conflicts:
	Gruntfile.js
	test/index.html
  • Loading branch information...
scottgonzalez authored and timmywil committed Jun 10, 2014
1 parent 62f7f7b commit 72e61925179aac67df234c46b94fcac829142897
View
@@ -1,5 +1,5 @@
{
"preset": "jquery",
"excludeFiles": [ "src/intro.js", "src/outro.js", "src/sizzle/**/*" ]
"excludeFiles": [ "external", "src/intro.js", "src/outro.js" ]
}
View
@@ -1,7 +1,6 @@
external
src/intro.js
src/outro.js
src/sizzle/**/*
test/libs/**/*
test/data/jquery-1.9.1.js
test/data/badcall.js
test/data/badjson.js
View
@@ -45,23 +45,23 @@ module.exports = function( grunt ) {
}
},
bowercopy: {
options: {
clean: true
},
src: {
files: {
"src/sizzle/dist": "sizzle/dist"
}
},
tests: {
all: {
options: {
destPrefix: "test/libs"
clean: true,
destPrefix: "external"
},
files: {
"qunit": "qunit/qunit",
"require.js": "requirejs/require.js",
"sizzle/dist": "sizzle/dist",
"qunit/qunit.js": "qunit/qunit/qunit.js",
"qunit/qunit.css": "qunit/qunit/qunit.css",
"qunit/MIT-LICENSE.txt": "qunit/MIT-LICENSE.txt",
"requirejs/require.js": "requirejs/require.js",
"sinon/fake_timers.js": "sinon/lib/sinon/util/fake_timers.js",
"sinon/timers_ie.js": "sinon/lib/sinon/util/timers_ie.js"
"sinon/timers_ie.js": "sinon/lib/sinon/util/timers_ie.js",
"sinon/LICENSE.txt": "sinon/LICENSE"
}
}
},
View
@@ -1,6 +1,6 @@
var fs = require( "fs" ),
bower = require( "grunt-bowercopy/node_modules/bower" ),
sizzleLoc = __dirname + "/../src/sizzle/dist/sizzle.js",
sizzleLoc = __dirname + "/../external/sizzle/dist/sizzle.js",
rversion = /Engine v(\d+\.\d+\.\d+(?:-\w+)?)/;
/**
View
@@ -26,7 +26,7 @@ module.exports = function( grunt ) {
endFile: "src/outro.js"
},
paths: {
sizzle: "sizzle/dist/sizzle"
sizzle: "../external/sizzle/dist/sizzle"
},
rawText: {},
onBuildWrite: convert
@@ -0,0 +1,21 @@
Copyright 2013 jQuery Foundation and other contributors
http://jquery.com/
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.
File renamed without changes.
File renamed without changes.
File renamed without changes.
View
@@ -0,0 +1,27 @@
(The BSD License)
Copyright (c) 2010-2013, Christian Johansen, christian@cjohansen.no
All rights reserved.
Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
* Neither the name of Christian Johansen nor the names of his contributors
may be used to endorse or promote products derived from this software
without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
File renamed without changes.
File renamed without changes.
File renamed without changes.
View
@@ -4,7 +4,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=Edge" />
<title>jQuery Test Suite</title>
<link rel="Stylesheet" media="screen" href="libs/qunit/qunit.css" />
<link rel="Stylesheet" media="screen" href="../external/qunit/qunit.css" />
<link rel="Stylesheet" media="screen" href="data/testsuite.css" />
<!-- Includes -->
@@ -14,10 +14,10 @@
-->
<script src="data/jquery-1.9.1.js"></script>
<script src="libs/qunit/qunit.js"></script>
<script src="libs/require.js"></script>
<script src="libs/sinon/fake_timers.js"></script>
<script src="libs/sinon/timers_ie.js"></script>
<script src="../external/qunit/qunit.js"></script>
<script src="../external/requirejs/require.js"></script>
<script src="../external/sinon/fake_timers.js"></script>
<script src="../external/sinon/timers_ie.js"></script>
<!-- See testinit for the list of tests -->
<script src="data/testinit.js"></script>
View
@@ -32,7 +32,7 @@
require.config({
baseUrl: path,
paths: {
sizzle: "src/sizzle/dist/sizzle"
sizzle: "external/sizzle/dist/sizzle"
}
});
src = "src/jquery";
@@ -1,31 +0,0 @@
/*global sinon, setTimeout, setInterval, clearTimeout, clearInterval, Date*/
/**
* Helps IE run the fake timers. By defining global functions, IE allows
* them to be overwritten at a later point. If these are not defined like
* this, overwriting them will result in anything from an exception to browser
* crash.
*
* If you don't require fake timers to work in IE, don't include this file.
*
* @author Christian Johansen (christian@cjohansen.no)
* @license BSD
*
* Copyright (c) 2010-2013 Christian Johansen
*/
function setTimeout() {}
function clearTimeout() {}
function setImmediate() {}
function clearImmediate() {}
function setInterval() {}
function clearInterval() {}
function Date() {}
// Reassign the original functions. Now their writable attribute
// should be true. Hackish, I know, but it works.
setTimeout = sinon.timers.setTimeout;
clearTimeout = sinon.timers.clearTimeout;
setImmediate = sinon.timers.setImmediate;
clearImmediate = sinon.timers.clearImmediate;
setInterval = sinon.timers.setInterval;
clearInterval = sinon.timers.clearInterval;
Date = sinon.timers.Date;

0 comments on commit 72e6192

Please sign in to comment.