Commit 415a42dd2e711f7b6e92c7c97f385cf9d8ce2ae7
1 parent
836a597e57
Exists in
master
and in
2 other branches
fix jquery bower
Showing 4 changed files with 5 additions and 5 deletions Inline Diff
app/bower_components/bootstrap/.bower.json
| 1 | { | 1 | { |
| 2 | "name": "bootstrap", | 2 | "name": "bootstrap", |
| 3 | "description": "The most popular front-end framework for developing responsive, mobile first projects on the web.", | 3 | "description": "The most popular front-end framework for developing responsive, mobile first projects on the web.", |
| 4 | "keywords": [ | 4 | "keywords": [ |
| 5 | "css", | 5 | "css", |
| 6 | "js", | 6 | "js", |
| 7 | "less", | 7 | "less", |
| 8 | "mobile-first", | 8 | "mobile-first", |
| 9 | "responsive", | 9 | "responsive", |
| 10 | "front-end", | 10 | "front-end", |
| 11 | "framework", | 11 | "framework", |
| 12 | "web" | 12 | "web" |
| 13 | ], | 13 | ], |
| 14 | "homepage": "http://getbootstrap.com", | 14 | "homepage": "http://getbootstrap.com", |
| 15 | "license": "MIT", | 15 | "license": "MIT", |
| 16 | "moduleType": "globals", | 16 | "moduleType": "globals", |
| 17 | "main": [ | 17 | "main": [ |
| 18 | "less/bootstrap.less", | 18 | "less/bootstrap.less", |
| 19 | "dist/js/bootstrap.js" | 19 | "dist/js/bootstrap.js" |
| 20 | ], | 20 | ], |
| 21 | "ignore": [ | 21 | "ignore": [ |
| 22 | "/.*", | 22 | "/.*", |
| 23 | "_config.yml", | 23 | "_config.yml", |
| 24 | "CNAME", | 24 | "CNAME", |
| 25 | "composer.json", | 25 | "composer.json", |
| 26 | "CONTRIBUTING.md", | 26 | "CONTRIBUTING.md", |
| 27 | "docs", | 27 | "docs", |
| 28 | "js/tests", | 28 | "js/tests", |
| 29 | "test-infra" | 29 | "test-infra" |
| 30 | ], | 30 | ], |
| 31 | "dependencies": { | 31 | "dependencies": { |
| 32 | "jquery": "1.9.1 - 3" | 32 | "jquery": "1.9.1 - 3" |
| 33 | }, | 33 | }, |
| 34 | "version": "3.3.7", | 34 | "version": "3.3.7", |
| 35 | "_release": "3.3.7", | 35 | "_release": "3.3.7", |
| 36 | "_resolution": { | 36 | "_resolution": { |
| 37 | "type": "version", | 37 | "type": "version", |
| 38 | "tag": "v3.3.7", | 38 | "tag": "v3.3.7", |
| 39 | "commit": "0b9c4a4007c44201dce9a6cc1a38407005c26c86" | 39 | "commit": "0b9c4a4007c44201dce9a6cc1a38407005c26c86" |
| 40 | }, | 40 | }, |
| 41 | "_source": "https://github.com/twbs/bootstrap.git", | 41 | "_source": "https://github.com/twbs/bootstrap.git", |
| 42 | "_target": "^3.3.7", | 42 | "_target": "~3.3.7", |
| 43 | "_originalSource": "bootstrap" | 43 | "_originalSource": "bootstrap" |
| 44 | } | 44 | } |
app/bower_components/jquery/.bower.json
| 1 | { | 1 | { |
| 2 | "name": "jquery", | 2 | "name": "jquery", |
| 3 | "main": "dist/jquery.js", | 3 | "main": "dist/jquery.js", |
| 4 | "license": "MIT", | 4 | "license": "MIT", |
| 5 | "ignore": [ | 5 | "ignore": [ |
| 6 | "package.json" | 6 | "package.json" |
| 7 | ], | 7 | ], |
| 8 | "keywords": [ | 8 | "keywords": [ |
| 9 | "jquery", | 9 | "jquery", |
| 10 | "javascript", | 10 | "javascript", |
| 11 | "browser", | 11 | "browser", |
| 12 | "library" | 12 | "library" |
| 13 | ], | 13 | ], |
| 14 | "homepage": "https://github.com/jquery/jquery-dist", | 14 | "homepage": "https://github.com/jquery/jquery-dist", |
| 15 | "version": "3.1.1", | 15 | "version": "3.1.1", |
| 16 | "_release": "3.1.1", | 16 | "_release": "3.1.1", |
| 17 | "_resolution": { | 17 | "_resolution": { |
| 18 | "type": "version", | 18 | "type": "version", |
| 19 | "tag": "3.1.1", | 19 | "tag": "3.1.1", |
| 20 | "commit": "1b30f3ad466ebf2714d47eda34dbd7fdf6849fe3" | 20 | "commit": "1b30f3ad466ebf2714d47eda34dbd7fdf6849fe3" |
| 21 | }, | 21 | }, |
| 22 | "_source": "https://github.com/jquery/jquery-dist.git", | 22 | "_source": "https://github.com/jquery/jquery-dist.git", |
| 23 | "_target": "^3.1.1", | 23 | "_target": "~3.1.1", |
| 24 | "_originalSource": "jquery" | 24 | "_originalSource": "jquery" |
| 25 | } | 25 | } |
app/index.html
| 1 | <!doctype html> | 1 | <!doctype html> |
| 2 | <!--[if IE 7]> <html class="no-js lt-ie9 lt-ie8" id="ng-app" ng-app=""> <![endif]--> | 2 | <!--[if IE 7]> <html class="no-js lt-ie9 lt-ie8" id="ng-app" ng-app=""> <![endif]--> |
| 3 | <!--[if IE 8]> <html class="no-js lt-ie9" id="ng-app" ng-app=""> <![endif]--> | 3 | <!--[if IE 8]> <html class="no-js lt-ie9" id="ng-app" ng-app=""> <![endif]--> |
| 4 | <!--[if gt IE 8]><!--> <html class="no-js" ng-app> <!--<![endif]--> | 4 | <!--[if gt IE 8]><!--> <html class="no-js" ng-app> <!--<![endif]--> |
| 5 | <head> | 5 | <head> |
| 6 | <meta charset="utf-8"> | 6 | <meta charset="utf-8"> |
| 7 | <meta http-equiv="X-UA-Compatible" content="IE=edge"> | 7 | <meta http-equiv="X-UA-Compatible" content="IE=edge"> |
| 8 | <title></title> | 8 | <title></title> |
| 9 | <meta name="description" content=""> | 9 | <meta name="description" content=""> |
| 10 | <meta name="viewport" content="width=device-width"> | 10 | <meta name="viewport" content="width=device-width"> |
| 11 | <!-- Place favicon.ico and apple-touch-icon.png in the root directory --> | 11 | <!-- Place favicon.ico and apple-touch-icon.png in the root directory --> |
| 12 | <!-- build:css styles/vendor.css --> | 12 | <!-- build:css styles/vendor.css --> |
| 13 | <!-- bower:css --> | 13 | <!-- bower:css --> |
| 14 | <link rel="stylesheet" href="bower_components/bootstrap/dist/css/bootstrap.css" /> | 14 | <link rel="stylesheet" href="bower_components/bootstrap/dist/css/bootstrap.css" /> |
| 15 | <link rel="stylesheet" href="bower_components/font-awesome/css/font-awesome.min.css" /> | 15 | <link rel="stylesheet" href="bower_components/font-awesome/css/font-awesome.min.css" /> |
| 16 | <!-- endbower --> | 16 | <!-- endbower --> |
| 17 | <!-- endbuild --> | 17 | <!-- endbuild --> |
| 18 | <!-- build:css({.tmp,app}) styles/main.css --> | 18 | <!-- build:css({.tmp,app}) styles/main.css --> |
| 19 | <link rel="stylesheet" href="styles/main.css"> | 19 | <link rel="stylesheet" href="styles/main.css"> |
| 20 | <!-- endbuild --> | 20 | <!-- endbuild --> |
| 21 | </head> | 21 | </head> |
| 22 | <body ng-app="tshatsApp"> | 22 | <body ng-app="tshatsApp"> |
| 23 | <!--[if lt IE 7]> | 23 | <!--[if lt IE 7]> |
| 24 | <p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p> | 24 | <p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p> |
| 25 | <![endif]--> | 25 | <![endif]--> |
| 26 | 26 | ||
| 27 | <!-- Add your site or application content here --> | 27 | <!-- Add your site or application content here --> |
| 28 | <div class="container" ng-view></div> | 28 | <div class="container" ng-view></div> |
| 29 | 29 | ||
| 30 | <!-- Google Analytics: change UA-XXXXX-X to be your site's ID --> | 30 | <!-- Google Analytics: change UA-XXXXX-X to be your site's ID --> |
| 31 | <script> | 31 | <script> |
| 32 | (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ | 32 | (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ |
| 33 | (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), | 33 | (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), |
| 34 | m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) | 34 | m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) |
| 35 | })(window,document,'script','//www.google-analytics.com/analytics.js','ga'); | 35 | })(window,document,'script','//www.google-analytics.com/analytics.js','ga'); |
| 36 | 36 | ||
| 37 | ga('create', 'UA-XXXXX-X'); | 37 | ga('create', 'UA-XXXXX-X'); |
| 38 | ga('send', 'pageview'); | 38 | ga('send', 'pageview'); |
| 39 | </script> | 39 | </script> |
| 40 | <script type="text/javascript" src="bower_components/jquery/dist/jquery.min.js"></script> | 40 | <script type="text/javascript" src="bower_components/jquery/dist/jquery.min.js"></script> |
| 41 | <script type="text/javascript" src="bower_components/bootstrap/dist/js/bootstrap.min.js"></script> | 41 | <script type="text/javascript" src="bower_components/bootstrap/dist/js/bootstrap.min.js"></script> |
| 42 | <!--[if lt IE 9]> | 42 | <!--[if lt IE 9]> |
| 43 | <script src="bower_components/es5-shim/es5-shim.js"></script> | 43 | <script src="bower_components/es5-shim/es5-shim.js"></script> |
| 44 | <script src="bower_components/json3/lib/json3.min.js"></script> | 44 | <script src="bower_components/json3/lib/json3.min.js"></script> |
| 45 | <![endif]--> | 45 | <![endif]--> |
| 46 | 46 | ||
| 47 | <script src="bower_components/requirejs/require.js" data-main="scripts/main.js"></script> | 47 | <script src="bower_components/requirejs/require.js" data-main="scripts/main"></script> |
| 48 | </body> | 48 | </body> |
| 49 | </html> | 49 | </html> |
| 50 | 50 |
bower.json
| 1 | { | 1 | { |
| 2 | "name": "tshats", | 2 | "name": "tshats", |
| 3 | "version": "0.0.0", | 3 | "version": "0.0.0", |
| 4 | "dependencies": { | 4 | "dependencies": { |
| 5 | "angular": "~1.5.9", | 5 | "angular": "~1.5.9", |
| 6 | "json3": "~3.2.6", | 6 | "json3": "~3.2.6", |
| 7 | "requirejs": "~2.1.10", | 7 | "requirejs": "~2.1.10", |
| 8 | "es5-shim": "~2.1.0", | 8 | "es5-shim": "~2.1.0", |
| 9 | "angular-resource": "1.2.11", | 9 | "angular-resource": "1.2.11", |
| 10 | "angular-cookies": "~1.5.9", | 10 | "angular-cookies": "~1.5.9", |
| 11 | "angular-sanitize": "1.2.11", | 11 | "angular-sanitize": "1.2.11", |
| 12 | "angular-route": "~1.5.9", | 12 | "angular-route": "~1.5.9", |
| 13 | "FortAwesome/Font-Awesome": "*", | 13 | "FortAwesome/Font-Awesome": "*", |
| 14 | "bootstrap": "^3.3.7", | 14 | "bootstrap": "~3.3.7", |
| 15 | "jquery": "^3.1.1" | 15 | "jquery": "~3.1.1" |
| 16 | }, | 16 | }, |
| 17 | "devDependencies": { | 17 | "devDependencies": { |
| 18 | "angular-mocks": "1.2.11", | 18 | "angular-mocks": "1.2.11", |
| 19 | "angular-scenario": "1.2.11" | 19 | "angular-scenario": "1.2.11" |
| 20 | }, | 20 | }, |
| 21 | "resolutions": { | 21 | "resolutions": { |
| 22 | "angular": "~1.5.9" | 22 | "angular": "~1.5.9" |
| 23 | } | 23 | } |
| 24 | } | 24 | } |
| 25 | 25 |