Skip to content

Commit

Permalink
Merge pull request #9968 from MarcelGerber/thirdparty-updates
Browse files Browse the repository at this point in the history
Update thirdparty libraries/submodules
  • Loading branch information
ingorichter committed Dec 2, 2014
2 parents 13cbc1e + 12776f9 commit 71b00c3
Show file tree
Hide file tree
Showing 10 changed files with 318 additions and 235 deletions.
4 changes: 2 additions & 2 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -250,15 +250,15 @@ module.exports = function (grunt) {
/* Keep in sync with test/SpecRunner.html dependencies */
vendor : [
'test/polyfills.js', /* For reference to why this polyfill is needed see Issue #7951. The need for this should go away once the version of phantomjs gets upgraded to 2.0 */
'src/thirdparty/jquery-2.1.0.min.js',
'src/thirdparty/jquery-2.1.1.min.js',
'src/thirdparty/CodeMirror2/lib/codemirror.js',
'src/thirdparty/CodeMirror2/lib/util/dialog.js',
'src/thirdparty/CodeMirror2/lib/util/searchcursor.js',
'src/thirdparty/CodeMirror2/addon/edit/closetag.js',
'src/thirdparty/CodeMirror2/addon/selection/active-line.js',
'src/thirdparty/mustache/mustache.js',
'src/thirdparty/path-utils/path-utils.min',
'src/thirdparty/less-1.7.0.min.js'
'src/thirdparty/less-1.7.5.min.js'
],
helpers : [
'test/spec/PhantomHelper.js'
Expand Down
4 changes: 2 additions & 2 deletions src/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@
<!-- Pre-load third party scripts that cannot be async loaded. -->
<!-- build:js thirdparty/thirdparty.min.js -->
<script src="thirdparty/less-config.js"></script>
<script src="thirdparty/less-1.7.0.min.js"></script>
<script src="thirdparty/less-1.7.5.min.js"></script>
<script src="thirdparty/mustache/mustache.js"></script>
<script src="thirdparty/jquery-2.1.0.min.js"></script>
<script src="thirdparty/jquery-2.1.1.min.js"></script>
<!-- endbuild -->
</head>
<body>
Expand Down
4 changes: 0 additions & 4 deletions src/thirdparty/jquery-2.1.0.min.js

This file was deleted.

Loading

0 comments on commit 71b00c3

Please sign in to comment.