Pull jQuery via npm instead of bower.

This commit is contained in:
László Monda
2016-03-22 21:05:46 +01:00
parent f604b94012
commit 667490011d
6 changed files with 8 additions and 9 deletions

View File

@@ -5,7 +5,6 @@
"Arpad Csanyi" "Arpad Csanyi"
], ],
"dependencies": { "dependencies": {
"jquery": "~2.1.4",
"bootstrap": "~3.3.6", "bootstrap": "~3.3.6",
"font-awesome": "fontawesome#~4.5.0", "font-awesome": "fontawesome#~4.5.0",
"handlebars": "~4.0.5", "handlebars": "~4.0.5",

View File

@@ -144,7 +144,7 @@
</div> </div>
<script type="text/javascript" src="./bower_components/jquery/dist/jquery.min.js"></script> <script type="text/javascript" src="node_modules/jquery/dist/jquery.min.js"></script>
<script type="text/javascript" src="bower_components/bootstrap/dist/js/bootstrap.min.js"></script> <script type="text/javascript" src="bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
<script type="text/javascript" src="bower_components/Sortable/Sortable.js"></script> <script type="text/javascript" src="bower_components/Sortable/Sortable.js"></script>
<script type="text/javascript" src="bower_components/handlebars/handlebars.js"></script> <script type="text/javascript" src="bower_components/handlebars/handlebars.js"></script>

View File

@@ -95,7 +95,7 @@ j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
</div> </div>
<script type="text/javascript" src="bower_components/jquery/dist/jquery.min.js"></script> <script type="text/javascript" src="node_modules/jquery/dist/jquery.min.js"></script>
<script type="text/javascript" src="bower_components/bootstrap/dist/js/bootstrap.min.js"></script> <script type="text/javascript" src="bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
<script type="text/javascript" src="bower_components/Sortable/Sortable.js"></script> <script type="text/javascript" src="bower_components/Sortable/Sortable.js"></script>
<script type="text/javascript" src="macro.js"></script> <script type="text/javascript" src="macro.js"></script>

View File

@@ -6,10 +6,7 @@
"type": "git", "type": "git",
"url": "git@github.com:UltimateHackingKeyboard/agent-mockup.git" "url": "git@github.com:UltimateHackingKeyboard/agent-mockup.git"
}, },
"license": { "license": "GPL-3.0",
"type": "GPL-3.0",
"url": "http://www.gnu.org/licenses/gpl-3.0.en.html"
},
"devDependencies": { "devDependencies": {
"browser-sync": "^2.11.0", "browser-sync": "^2.11.0",
"gulp": "^3.9.0", "gulp": "^3.9.0",
@@ -17,5 +14,8 @@
"gulp-sass": "^2.2.0", "gulp-sass": "^2.2.0",
"gulp-sourcemaps": "^1.6.0", "gulp-sourcemaps": "^1.6.0",
"yargs": "^4.2.0" "yargs": "^4.2.0"
},
"dependencies": {
"jquery": "^2.2.2"
} }
} }

View File

@@ -44,7 +44,7 @@ j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
</div> </div>
</div> </div>
<script type="text/javascript" src="bower_components/jquery/dist/jquery.min.js"></script> <script type="text/javascript" src="node_modules/jquery/dist/jquery.min.js"></script>
<script type="text/javascript" src="bower_components/handlebars/handlebars.js"></script> <script type="text/javascript" src="bower_components/handlebars/handlebars.js"></script>
<script type="text/javascript" src="bower_components/bootstrap/dist/js/bootstrap.min.js"></script> <script type="text/javascript" src="bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
<script type="text/javascript" src="bower_components/select2/dist/js/select2.min.js"></script> <script type="text/javascript" src="bower_components/select2/dist/js/select2.min.js"></script>

View File

@@ -28,7 +28,7 @@
</div> </div>
</div> </div>
<script type="text/javascript" src="bower_components/jquery/dist/jquery.min.js"></script> <script type="text/javascript" src="node_modules/jquery/dist/jquery.min.js"></script>
<script type="text/javascript" src="bower_components/handlebars/handlebars.js"></script> <script type="text/javascript" src="bower_components/handlebars/handlebars.js"></script>
<script type="text/javascript" src="bower_components/bootstrap/dist/js/bootstrap.min.js"></script> <script type="text/javascript" src="bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
<script type="text/javascript" src="bower_components/select2/dist/js/select2.min.js"></script> <script type="text/javascript" src="bower_components/select2/dist/js/select2.min.js"></script>