Use local jquery vendor

This commit is contained in:
manzerbredes 2016-02-03 19:04:56 +01:00
parent c6186b71c1
commit 6566017d2b
3 changed files with 8 additions and 3 deletions

View file

@ -60,16 +60,17 @@
<!-- Include JQuery -->
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>
<script src="./vendors/jquery/js/jquery-2.2.0.min.js"></script>
<!-- Include Bootstrap -->
<script src="./vendors/bootstrap/js/bootstrap.min.js"></script>
<!-- Include AngularJS and dependencies-->
<script src="./vendors/angularjs/angular.min.js"></script>
<script src="./vendors/angularjs/angular-route.min.js"></script>
<script src="./vendors/angularjs/angular-sanitize.min.js"></script>
<script src="./js/app.js"></script>
<!-- Include resquest dependencies -->
<script src="./js/requests/identity.js"></script>

View file

@ -11,7 +11,7 @@
mainApp.controller('loginCtrl', function ($scope,$interval,$sce)
{
// Define default states
//$('#loginModal').modal({backdrop: 'static', keyboard: false});
$('#loginModal').modal({backdrop: 'static', keyboard: false});
$('#loadingLoginButton').hide();
$('#failedToLoginAlert').hide();

File diff suppressed because one or more lines are too long