diff --git a/app/assets/javascripts/app.js b/app/assets/javascripts/app.js index b4fbe1d4b..219439d28 100644 --- a/app/assets/javascripts/app.js +++ b/app/assets/javascripts/app.js @@ -14,7 +14,7 @@ Application.Controllers = angular.module('application.controllers', []); Application.Filters = angular.module('application.filters', []); Application.Directives = angular.module('application.directives', []); -angular.module('application', ['ngCookies', 'ngResource', 'ngSanitize', 'ngCookies', 'ui.router', 'ui.bootstrap', +angular.module('application', ['ngCookies', 'ngResource', 'ngSanitize', 'ui.router', 'ui.bootstrap', 'ngUpload', 'duScroll', 'application.filters', 'application.services', 'application.directives', 'frapontillo.bootstrap-switch', 'application.constants', 'application.controllers', 'application.router', 'ui.select', 'ui.calendar', 'angularMoment', 'Devise', 'DeviseModal', 'angular-growl', 'xeditable', diff --git a/app/assets/javascripts/controllers/admin/events.js.erb b/app/assets/javascripts/controllers/admin/events.js.erb index a92d02408..774111ed7 100644 --- a/app/assets/javascripts/controllers/admin/events.js.erb +++ b/app/assets/javascripts/controllers/admin/events.js.erb @@ -505,7 +505,7 @@ Application.Controllers.controller('EditEventController', ['$scope', '$state', ' // List of categories for the events $scope.categories = categoriesPromise; - // List of availables price's categories + // List of available price's categories $scope.priceCategories = priceCategoriesPromise; // List of events themes diff --git a/app/assets/javascripts/controllers/main_nav.js b/app/assets/javascripts/controllers/main_nav.js index 5ff186c88..7f97e3550 100644 --- a/app/assets/javascripts/controllers/main_nav.js +++ b/app/assets/javascripts/controllers/main_nav.js @@ -13,7 +13,7 @@ /** * Navigation controller. List the links availables in the left navigation pane and their icon. */ -Application.Controllers.controller('MainNavController', ['$scope', '$location', '$cookies', function ($scope, $location, $cookies) { +Application.Controllers.controller('MainNavController', ['$scope', function ($scope) { // Common links (public application) $scope.navLinks = [ { diff --git a/app/assets/javascripts/directives/directives.js b/app/assets/javascripts/directives/directives.js index c6e30f5e3..c768c521e 100644 --- a/app/assets/javascripts/directives/directives.js +++ b/app/assets/javascripts/directives/directives.js @@ -85,7 +85,7 @@ Application.Directives.directive('disableAnimation', ['$animate', ($animate) => ({ restrict: 'A', link (scope, elem, attrs) { - return attrs.$observe('disableAnimation', value => $animate.enabled(!value, elem)); + return attrs.$observe('disableAnimation', value => $animate.enabled(elem, !value)); } }) ]); diff --git a/app/assets/javascripts/services/csrf.js b/app/assets/javascripts/services/csrf.js index f9d8b4fff..294700be8 100644 --- a/app/assets/javascripts/services/csrf.js +++ b/app/assets/javascripts/services/csrf.js @@ -12,9 +12,9 @@ Application.Services.service('CSRF', ['$cookies', setMetaTags () { if (angular.element('meta[name="csrf-param"]').length === 0) { angular.element('head').append(''); - angular.element('head').append(``); + angular.element('head').append(``); } else { - angular.element('meta[name="csrf-token"]').replaceWith(``); + angular.element('meta[name="csrf-token"]').replaceWith(``); } } }) diff --git a/package.json b/package.json index d5a6468cf..21c35735d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fab-manager", - "version": "2.7.0", + "version": "2.7.1-dev", "description": "FabManager is the FabLab management solution. It is web-based, open-source and totally free.", "keywords": [ "fablab", @@ -27,7 +27,7 @@ "dependencies": { "@uirouter/angularjs": "0.4", "AngularDevise": "https://github.com/cloudspace/angular_devise.git#1.0.2", - "angular": "1.3", + "angular": "1.4", "angular-animate": "1.3", "angular-aside": "1.3", "angular-base64-upload": "^0.0.9", diff --git a/yarn.lock b/yarn.lock index 2288d2e11..56e9fce65 100644 --- a/yarn.lock +++ b/yarn.lock @@ -190,10 +190,10 @@ angular-xeditable@0.1: jquery "^1.11.1" moment "^2.5.0" -angular@1.3: - version "1.3.20" - resolved "https://registry.yarnpkg.com/angular/-/angular-1.3.20.tgz#b23a3d7c5e7f99f7d95b9b4d49b9ac355269baee" - integrity sha1-sjo9fF5/mffZW5tNSbmsNVJpuu4= +angular@1.4: + version "1.4.14" + resolved "https://registry.yarnpkg.com/angular/-/angular-1.4.14.tgz#9d0feaf60ce6e52ce50f49ee328656d1e1875c37" + integrity sha1-nQ/q9gzm5SzlD0nuMoZW0eGHXDc= angular@^1.0.8, angular@~1.x: version "1.7.5"