Merge branch 'master' of https://github.com/bahaaldine/angular-csv-import

Author: bahaaldine

dist/angular-csv-import.js

@@ -1,4 +1,4 @@
-/*! angular-csv-import - v0.0.15 - 2015-04-08
+/*! angular-csv-import - v0.0.16 - 2015-05-12
 * Copyright (c) 2015 ; Licensed  */
 'use strict';
 
@@ -34,6 +34,7 @@ csvImport.directive('ngCsvImport', function() {
 
 			element.on('change', function(onChangeEvent) {
 				var reader = new FileReader();
+				scope.filename = onChangeEvent.target.files[0].name;
 				reader.onload = function(onLoadEvent) {
 					scope.$apply(function() {
 						var content = {
@@ -44,8 +45,10 @@ csvImport.directive('ngCsvImport', function() {
 
 						scope.content = content.csv;
 						scope.result = csvToJSON(content);
+						scope.result.filename = scope.filename;
 					});
 				};
+
 				if ( (onChangeEvent.target.type === "file") && (onChangeEvent.target.files != null || onChangeEvent.srcElement.files != null) )  {
 					reader.readAsText((onChangeEvent.srcElement || onChangeEvent.target).files[0]);
 				} else {

dist/angular-csv-import.min.js

@@ -12,10 +12,11 @@ csvImport.directive('ngCsvImport', function() {
 			header: '=',
 			headerVisible: '=',
 			separator: '=',
+			separatorVisible: '=',
 			result: '='
 		},
-		template: '<div><div ng-show="header && headerVisible"><div class="label">Header</div><input type="checkbox" ng-model="header"></div>'+
-			'<div ng-show="separator" ><div class="label">Seperator</div><input type="text" ng-change="changeSeparator" ng-model="separator"></div>'+
+		template: '<div><div ng-show="headerVisible"><div class="label">Header</div><input type="checkbox" ng-model="header"></div>'+
+			'<div ng-show="separatorVisible" ><div class="label">Seperator</div><input type="text" ng-change="changeSeparator" ng-model="separator"></div>'+
 			'<div><input class="btn cta gray" type="file"/></div></div>',
 		link: function(scope, element) {
 			element.on('keyup', function(e){
@@ -32,6 +33,7 @@ csvImport.directive('ngCsvImport', function() {
 
 			element.on('change', function(onChangeEvent) {
 				var reader = new FileReader();
+				scope.filename = onChangeEvent.target.files[0].name;
 				reader.onload = function(onLoadEvent) {
 					scope.$apply(function() {
 						var content = {
@@ -42,8 +44,10 @@ csvImport.directive('ngCsvImport', function() {
 
 						scope.content = content.csv;
 						scope.result = csvToJSON(content);
+						scope.result.filename = scope.filename;
 					});
 				};
+
 				if ( (onChangeEvent.target.type === "file") && (onChangeEvent.target.files != null || onChangeEvent.srcElement.files != null) )  {
 					reader.readAsText((onChangeEvent.srcElement || onChangeEvent.target).files[0]);
 				} else {