From e88f126da1d3ddbeae095ed24d89470438b6b3d3 Mon Sep 17 00:00:00 2001 From: Daniel Gehrlein Date: Wed, 30 Apr 2014 11:29:30 +0200 Subject: [PATCH 1/5] (style): autoreformat field-directive.js there was 1 unnecessary tab --- app/scripts/directives/field-directive.js | 102 +++++++++++----------- 1 file changed, 51 insertions(+), 51 deletions(-) diff --git a/app/scripts/directives/field-directive.js b/app/scripts/directives/field-directive.js index f9b5d90..cdbdc91 100644 --- a/app/scripts/directives/field-directive.js +++ b/app/scripts/directives/field-directive.js @@ -1,58 +1,58 @@ 'use strict'; -angularApp.directive('fieldDirective', function ($http, $compile) { +angularApp.directive('fieldDirective', function($http, $compile) { - var getTemplateUrl = function(field) { - var type = field.field_type; - var templateUrl = ''; + var getTemplateUrl = function(field) { + var type = field.field_type; + var templateUrl = ''; - switch(type) { - case 'textfield': - templateUrl = './views/directive-templates/field/textfield.html'; - break; - case 'email': - templateUrl = './views/directive-templates/field/email.html'; - break; - case 'textarea': - templateUrl = './views/directive-templates/field/textarea.html'; - break; - case 'checkbox': - templateUrl = './views/directive-templates/field/checkbox.html'; - break; - case 'date': - templateUrl = './views/directive-templates/field/date.html'; - break; - case 'dropdown': - templateUrl = './views/directive-templates/field/dropdown.html'; - break; - case 'hidden': - templateUrl = './views/directive-templates/field/hidden.html'; - break; - case 'password': - templateUrl = './views/directive-templates/field/password.html'; - break; - case 'radio': - templateUrl = './views/directive-templates/field/radio.html'; - break; - } - return templateUrl; + switch (type) { + case 'textfield': + templateUrl = './views/directive-templates/field/textfield.html'; + break; + case 'email': + templateUrl = './views/directive-templates/field/email.html'; + break; + case 'textarea': + templateUrl = './views/directive-templates/field/textarea.html'; + break; + case 'checkbox': + templateUrl = './views/directive-templates/field/checkbox.html'; + break; + case 'date': + templateUrl = './views/directive-templates/field/date.html'; + break; + case 'dropdown': + templateUrl = './views/directive-templates/field/dropdown.html'; + break; + case 'hidden': + templateUrl = './views/directive-templates/field/hidden.html'; + break; + case 'password': + templateUrl = './views/directive-templates/field/password.html'; + break; + case 'radio': + templateUrl = './views/directive-templates/field/radio.html'; + break; } + return templateUrl; + } - var linker = function(scope, element) { - // GET template content from path - var templateUrl = getTemplateUrl(scope.field); - $http.get(templateUrl).success(function(data) { - element.html(data); - $compile(element.contents())(scope); - }); - } + var linker = function(scope, element) { + // GET template content from path + var templateUrl = getTemplateUrl(scope.field); + $http.get(templateUrl).success(function(data) { + element.html(data); + $compile(element.contents())(scope); + }); + } - return { - template: '
{{field}}
', - restrict: 'E', - scope: { - field:'=' - }, - link: linker - }; - }); + return { + template: '
{{field}}
', + restrict: 'E', + scope: { + field: '=' + }, + link: linker + }; +}); \ No newline at end of file From 2248918d17093f59fb88aa31f348e6aa052d1461 Mon Sep 17 00:00:00 2001 From: Daniel Gehrlein Date: Wed, 30 Apr 2014 11:38:18 +0200 Subject: [PATCH 2/5] refactored switch case in field-directive replace switch case with a for in loop --- app/scripts/directives/field-directive.js | 52 ++++++++++------------- 1 file changed, 22 insertions(+), 30 deletions(-) diff --git a/app/scripts/directives/field-directive.js b/app/scripts/directives/field-directive.js index cdbdc91..c19e5f6 100644 --- a/app/scripts/directives/field-directive.js +++ b/app/scripts/directives/field-directive.js @@ -1,41 +1,33 @@ 'use strict'; +// coffeescript's for in loop +var __indexOf = [].indexOf || function(item) { + for (var i = 0, l = this.length; i < l; i++) { + if (i in this && this[i] === item) return i; + } + return -1; + }; + angularApp.directive('fieldDirective', function($http, $compile) { var getTemplateUrl = function(field) { var type = field.field_type; - var templateUrl = ''; + var templateUrl = './views/directive-templates/field/'; + var supported_fields = [ + 'textfield', + 'email', + 'textarea', + 'checkbox', + 'date', + 'dropdown', + 'hidden', + 'password', + 'radio' + ] - switch (type) { - case 'textfield': - templateUrl = './views/directive-templates/field/textfield.html'; - break; - case 'email': - templateUrl = './views/directive-templates/field/email.html'; - break; - case 'textarea': - templateUrl = './views/directive-templates/field/textarea.html'; - break; - case 'checkbox': - templateUrl = './views/directive-templates/field/checkbox.html'; - break; - case 'date': - templateUrl = './views/directive-templates/field/date.html'; - break; - case 'dropdown': - templateUrl = './views/directive-templates/field/dropdown.html'; - break; - case 'hidden': - templateUrl = './views/directive-templates/field/hidden.html'; - break; - case 'password': - templateUrl = './views/directive-templates/field/password.html'; - break; - case 'radio': - templateUrl = './views/directive-templates/field/radio.html'; - break; + if (__indexOf.call(supported_fields, type) >= 0) { + return templateUrl += type + '.html'; } - return templateUrl; } var linker = function(scope, element) { From 41f2436dd8beba1c327a8acd2c9a64a5d57f0746 Mon Sep 17 00:00:00 2001 From: Selman K Date: Mon, 30 Mar 2015 20:33:48 -0700 Subject: [PATCH 3/5] deleting compass grunt task --- Gruntfile.js | 36 ------------------------------------ 1 file changed, 36 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index d4b3295..33a1ec8 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -29,18 +29,6 @@ module.exports = function (grunt) { grunt.initConfig({ yeoman: yeomanConfig, watch: { - coffee: { - files: ['<%= yeoman.app %>/scripts/{,*/}*.coffee'], - tasks: ['coffee:dist'] - }, - coffeeTest: { - files: ['test/spec/{,*/}*.coffee'], - tasks: ['coffee:test'] - }, - compass: { - files: ['<%= yeoman.app %>/styles/{,*/}*.{scss,sass}'], - tasks: ['compass:server'] - }, livereload: { options: { livereload: LIVERELOAD_PORT @@ -137,27 +125,6 @@ module.exports = function (grunt) { }] } }, - compass: { - options: { - sassDir: '<%= yeoman.app %>/styles', - cssDir: '.tmp/styles', - generatedImagesDir: '.tmp/images/generated', - imagesDir: '<%= yeoman.app %>/images', - javascriptsDir: '<%= yeoman.app %>/scripts', - fontsDir: '<%= yeoman.app %>/styles/fonts', - importPath: '<%= yeoman.app %>/bower_components', - httpImagesPath: '/images', - httpGeneratedImagesPath: '/images/generated', - httpFontsPath: '/styles/fonts', - relativeAssets: false - }, - dist: {}, - server: { - options: { - debugInfo: true - } - } - }, // not used since Uglify task does concat, // but still available if needed /*concat: { @@ -262,15 +229,12 @@ module.exports = function (grunt) { concurrent: { server: [ 'coffee:dist', - 'compass:server' ], test: [ 'coffee', - 'compass' ], dist: [ 'coffee', - 'compass:dist', 'imagemin', 'htmlmin' ] From 99a96c07399963a21ee6fbce32d86442011d68f2 Mon Sep 17 00:00:00 2001 From: Aaron Straker Date: Thu, 11 Jun 2015 12:00:20 -0700 Subject: [PATCH 4/5] Updated return object "template" property to use ng-bind instead of interpolated value --- app/scripts/directives/field-directive.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/scripts/directives/field-directive.js b/app/scripts/directives/field-directive.js index c19e5f6..c77cbcd 100644 --- a/app/scripts/directives/field-directive.js +++ b/app/scripts/directives/field-directive.js @@ -40,7 +40,7 @@ angularApp.directive('fieldDirective', function($http, $compile) { } return { - template: '
{{field}}
', + template: '
', restrict: 'E', scope: { field: '=' From 3bd29a2ce3ff9fef5a44aaa1580077b0020bcde5 Mon Sep 17 00:00:00 2001 From: Selman K Date: Thu, 4 Feb 2016 19:59:26 -0800 Subject: [PATCH 5/5] updating jquery version --- bower.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bower.json b/bower.json index 27cbb03..688557c 100644 --- a/bower.json +++ b/bower.json @@ -4,7 +4,7 @@ "dependencies": { "angular": "~1.0.7", "json3": "~3.2.4", - "jquery": "~1.9.1", + "jquery": "~2.2.0", "bootstrap-sass": "~3.3.4", "es5-shim": "~2.0.8", "angular-resource": "~1.0.7",