angularjs and other dependencies are updated

sercaneraslan · May 12, 2018 · a231377 · a231377
1 parent 5eb6649
commit a231377
Show file tree

Hide file tree

Showing 8 changed files with 7,519 additions and 27 deletions.
diff --git a/app/js/config/ng-config.js b/app/js/config/ng-config.js
@@ -1,11 +1,11 @@
 // Defined Grabs Module
-var grabs = angular.module('grabs', [
-        'ngRoute',
-        'pageTitle'
-    ]);
+window.grabs = angular.module('grabs', [
+    'ngRoute',
+    'pageTitle'
+]);
 
 // Grabs Routing Configuration
-grabs.config(['$locationProvider', '$routeProvider', function ($locationProvider, $routeProvider) {
+angular.module('grabs').config(['$locationProvider', '$routeProvider', function ($locationProvider, $routeProvider) {
     'use strict';
 
     $routeProvider.when('/', {

diff --git a/app/js/filter/safeHtml.js b/app/js/filter/safeHtml.js
@@ -1,5 +1,5 @@
 // Safe HTML Filter
-grabs.filter('safeHtml', ['$sce', function($sce) {
+angular.module('grabs').filter('safeHtml', ['$sce', function($sce) {
     return function(val) {
         return $sce.trustAsHtml(val);
     };

diff --git a/app/js/service/languageService.js b/app/js/service/languageService.js
@@ -1,5 +1,5 @@
 // Grabs Language Service
-grabs.factory('languageService', ['$http', function($http) {
+angular.module('grabs').factory('languageService', ['$http', function($http) {
     'use strict';
 
     return {

diff --git a/app/views/homepage/HomepageCtrl.js b/app/views/homepage/HomepageCtrl.js
@@ -1,9 +1,9 @@
-grabs.controller('HomepageCtrl', ['$scope', '$route', 'languageService', function ($scope, $route, languageService) {
+angular.module('grabs').controller('HomepageCtrl', ['$scope', '$route', 'languageService', function ($scope, $route, languageService) {
     'use strict';
 
     $scope.lang = $route.current.key;
 
-    languageService.getLanguageFile('homepage/' + $scope.lang).success(function (response) {
-        $scope.ln = response;
+    languageService.getLanguageFile('homepage/' + $scope.lang).then(function (response) {
+        $scope.ln = response.data;
     });
 }]);
diff --git a/grabs b/grabs
@@ -37,7 +37,7 @@ if [[ "$COMMAND" == "install" ]]; then
     npm install || error "NPM Installation FAILED"
 
     info "Installing Bower Dependencies"
-    grunt bower:install || error "Bower Installation FAILED"
+    grunt bowercopy || error "Bower Installation FAILED"
 
     info "Grunt Working"
     grunt || error "Grunt FAILED"

diff --git a/gruntfile.js b/gruntfile.js
@@ -10,8 +10,8 @@
 module.exports = function (grunt) {
     var myHash = new Date().valueOf().toString(),
         sortedJsPaths = [
-            'js/components/angular/*.js',
-            'js/components/angular-route/*.js',
+            'js/components/angular.js',
+            'js/components/angular-route.js',
             'js/**/*.js',
             'views/**/*.js'
         ],
@@ -144,14 +144,19 @@ module.exports = function (grunt) {
             }
         },
 
-        bower: {
+        bowercopy: {
             options: {
-                targetDir: 'app/js/components',
-                cleanTargetDir: false,
-                cleanBowerDir: true,
-                verbose: true
+                clean: true
             },
-            install: {}
+            libs: {
+                options: {
+                    destPrefix: 'app/js/components/'
+                },
+                files: {
+                    'angular.js': 'angular/angular.js',
+                    'angular-route.js': 'angular-route/angular-route.js'
+                },
+            }
         },
 
         htmlmin: {