Skip to content

Commit

Permalink
Merge pull request #301 from DavidZey/master
Browse files Browse the repository at this point in the history
revert jquery upgrade - needs more testing
  • Loading branch information
etduroch committed Jan 13, 2015
2 parents f8f6a90 + 7241883 commit a00ff5e
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions lib/resource-packager.js
Original file line number Diff line number Diff line change
@@ -253,8 +253,7 @@ exports.packageFrameworkResources = function(options, callback) {
{path: "/feather-client/lib/underscore.js", prefix: prefix},
options.appOptions["socket.io"].enabled ? {path: "/socket.io/socket.io.js", prefix: prefix, virtual: true} : null, //virtual skips built-in minify
{path: "/feather-client/lib/json2.js", prefix: prefix},
{path: "//code.jquery.com/jquery-1.11.2.min.js", prefix: prefix, virtual: true}, //virtual skips built-in minify
{path: "//code.jquery.com/jquery-migrate-1.2.1.min.js", prefix: prefix, virtual: true}, //virtual skips built-in minify
{path: "//code.jquery.com/jquery-1.7.1.min.js", prefix: prefix, virtual: true}, //virtual skips built-in minify
{path: "/feather-client/lib/jquery.tmpl.js", prefix: prefix},
{path: "/feather-client/lib/jquery.cookie.js", prefix: prefix},
{path: "/feather-client/lib/inherits.js", prefix: prefix},

0 comments on commit a00ff5e

Please sign in to comment.