Merge pull request #30 from austinthedeveloper/accept-type

Added an Accept variable to limit file types
bahaaldine · Nov 26, 2015 · 4b5343c · 4b5343c
2 parents bc3b0b5 + d2aea77
commit 4b5343c
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 20 deletions.
diff --git a/README.md b/README.md
@@ -40,7 +40,8 @@ Include the **ng-csv-import** element with its options:
 <ng-csv-import content="csv.content"
 	header="csv.header" 
 	separator="csv.separator"
-	result="csv.result"></ng-csv-import>
+	result="csv.result"
+	accept="csv.accept"></ng-csv-import>
 ```
 
 - **csv.content**
@@ -74,3 +75,7 @@ A variable to toggle encoding visibility
 - **csv.result**
 
 A variable which will contain the result of the CSV to JSON marshalling.
+
+- **csv.accept**
+
+An optional variable to limit what file types are accepted. Ex. ".csv" to only accept csv file types.
diff --git a/dist/angular-csv-import.js b/dist/angular-csv-import.js
@@ -1,6 +1,4 @@
-/*! angular-csv-import - v0.0.20 - 2015-09-22
-* Copyright (c) 2015 ; Licensed  */
-/*! angular-csv-import - v0.0.18 - 2015-09-04
+/*! angular-csv-import - v0.0.26 - 2015-11-11
 * Copyright (c) 2015 ; Licensed  */
 'use strict';
 
@@ -19,12 +17,18 @@ csvImport.directive('ngCsvImport', function() {
 			separatorVisible: '=?',
 			result: '=?',
 			encoding: '=?',
-			encodingVisible: '=?'
+			encodingVisible: '=?',
+			accept: '=?'
 		},
-		template: '<div><div ng-show="headerVisible"><div class="label">Header</div><input type="checkbox" ng-model="header"></div>'+
+		template: '<div>'+
+		  '<div ng-show="headerVisible"><div class="label">Header</div><input type="checkbox" ng-model="header"></div>'+
 			'<div ng-show="encoding && encodingVisible"><div class="label">Encoding</div><span>{{encoding}}</span></div>'+
-			'<div ng-show="separator && separatorVisible"><div class="label">Seperator</div><span><input class="separator-input" type="text" ng-change="changeSeparator" ng-model="separator"><span></div>'+
-			'<div><input class="btn cta gray" type="file"/></div></div>',
+			'<div ng-show="separator && separatorVisible">'+
+			'<div class="label">Seperator</div>'+
+			'<span><input class="separator-input" type="text" ng-change="changeSeparator" ng-model="separator"><span>'+
+			'</div>'+
+			'<div><input class="btn cta gray" type="file" multiple accept="{{accept}}"/></div>'+
+			'</div>',
 		link: function(scope, element) {
 			scope.separatorVisible = scope.separatorVisible || false;
 			scope.headerVisible = scope.headerVisible || false;
@@ -88,7 +92,7 @@ csvImport.directive('ngCsvImport', function() {
 					var obj = {};
 					var currentline=lines[i].split(new RegExp(content.separator+'(?![^"]*"(?:(?:[^"]*"){2})*[^"]*$)'));
 					if ( currentline.length === columnCount ) {
-						if (content.header) {
+						if (content.header) {
 							for (var j=0; j<headers.length; j++) {
 								obj[headers[j]] = currentline[j];
 							}
@@ -104,4 +108,4 @@ csvImport.directive('ngCsvImport', function() {
 			};
 		}
 	};
-});
+});
diff --git a/dist/angular-csv-import.min.js b/dist/angular-csv-import.min.js
diff --git a/lib/angular-csv-import.js b/lib/angular-csv-import.js
@@ -1,5 +1,3 @@
-/*! angular-csv-import - v0.0.18 - 2015-09-04
-* Copyright (c) 2015 ; Licensed  */
 'use strict';
 
 var csvImport = angular.module('ngCsvImport', []);
@@ -17,12 +15,18 @@ csvImport.directive('ngCsvImport', function() {
 			separatorVisible: '=?',
 			result: '=?',
 			encoding: '=?',
-			encodingVisible: '=?'
+			encodingVisible: '=?',
+			accept: '=?'
 		},
-		template: '<div><div ng-show="headerVisible"><div class="label">Header</div><input type="checkbox" ng-model="header"></div>'+
+		template: '<div>'+
+		  '<div ng-show="headerVisible"><div class="label">Header</div><input type="checkbox" ng-model="header"></div>'+
 			'<div ng-show="encoding && encodingVisible"><div class="label">Encoding</div><span>{{encoding}}</span></div>'+
-			'<div ng-show="separator && separatorVisible"><div class="label">Seperator</div><span><input class="separator-input" type="text" ng-change="changeSeparator" ng-model="separator"><span></div>'+
-			'<div><input class="btn cta gray" type="file"/></div></div>',
+			'<div ng-show="separator && separatorVisible">'+
+			'<div class="label">Seperator</div>'+
+			'<span><input class="separator-input" type="text" ng-change="changeSeparator" ng-model="separator"><span>'+
+			'</div>'+
+			'<div><input class="btn cta gray" type="file" multiple accept="{{accept}}"/></div>'+
+			'</div>',
 		link: function(scope, element) {
 			scope.separatorVisible = scope.separatorVisible || false;
 			scope.headerVisible = scope.headerVisible || false;
@@ -86,7 +90,7 @@ csvImport.directive('ngCsvImport', function() {
 					var obj = {};
 					var currentline=lines[i].split(new RegExp(content.separator+'(?![^"]*"(?:(?:[^"]*"){2})*[^"]*$)'));
 					if ( currentline.length === columnCount ) {
-						if (content.header) {
+						if (content.header) {
 							for (var j=0; j<headers.length; j++) {
 								obj[headers[j]] = currentline[j];
 							}
@@ -102,4 +106,4 @@ csvImport.directive('ngCsvImport', function() {
 			};
 		}
 	};
-});
+});