Merge branch 'master' into gh-pages

* master: Refactor for issue #31 Update README.md
amweiss · Aug 17, 2016 · 8b78d2b · 8b78d2b
2 parents 7a03cda + 37c2ce5
commit 8b78d2b
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 26 deletions.
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@ angular-diff-match-patch
 
 This library is simply a wrapper around [google-diff-match-patch](https://code.google.com/p/google-diff-match-patch/).
 
-![Simple](http://i.imgur.com/BFHwYtq.png)
+![Simple](http://amweiss.github.io/angular-diff-match-patch/simple.png)
 
 (Shown here with some custom styles)
 

diff --git a/angular-diff-match-patch.js b/angular-diff-match-patch.js
@@ -56,27 +56,26 @@ angular.module('diff-match-patch', [])
 		}
 
 		function getTagAttrs(options, op, attrs) {
-			var tagOptions = new Map();
+			var tagOptions = {};
 			var retVal = [];
 			var opName = diffAttrName(op);
 
-			if (angular.isDefined(options) && angular.isDefined(options.attrs) && options.attrs instanceof Map && options.attrs.has(opName)) {
-				options.attrs.get(opName).forEach(function (value, key) {
-					tagOptions.set(key, value);
-				});
+			if (angular.isDefined(options) && angular.isDefined(options.attrs)) {
+				var attributesFromOptions = options.attrs[opName];
+				if (angular.isDefined(attributesFromOptions)) {
+					angular.merge(tagOptions, attributesFromOptions);
+				}
 			}
 
 			if (angular.isDefined(attrs)) {
-				attrs.forEach(function (value, key) {
-					tagOptions.set(key, value);
-				});
+				angular.merge(tagOptions, attrs);
 			}
 
-			if (tagOptions.size === 0) {
+			if (Object.keys(tagOptions).length === 0) {
 				return '';
 			}
 
-			tagOptions.forEach(function (value, key) {
+			angular.forEach(tagOptions, function (value, key) {
 				retVal.push(key + '="' + value + '"');
 			});
 
@@ -86,7 +85,7 @@ angular.module('diff-match-patch', [])
 		function getHtmlPrefix(op, display, options) {
 			switch (display) {
 				case displayType.LINEDIFF:
-					return '<div class="' + diffClass(op) + '"><span' + getTagAttrs(options, op, new Map().set('class', 'noselect')) + '>' + diffSymbol(op) + '</span>';
+					return '<div class="' + diffClass(op) + '"><span' + getTagAttrs(options, op, {class: 'noselect'}) + '>' + diffSymbol(op) + '</span>';
 				default: // case displayType.INSDEL:
 					return '<' + diffTag(op) + getTagAttrs(options, op) + '>';
 			}

diff --git a/index.html b/index.html
@@ -81,9 +81,18 @@
       $scope.options = {
         editCost: 4,
         interLineDiff: true,
-        attrs: new Map().set('insert', new Map().set('data-attr','insert').set('class','insertion'))
-                        .set('delete', new Map().set('data-attr', 'delete'))
-                        .set('equal', new Map().set('data-attr', 'equal'))
+        attrs: {
+          insert: {
+            'data-attr': 'insert',
+            'class': 'insertion'
+          },
+          delete: {
+            'data-attr': 'delete'
+          },
+          equal: {
+            'data-attr': 'equal'
+          }
+        }
       };
     }]);
   </script>
@@ -127,7 +136,8 @@ <h2>diff</h2>
               <h2>processingDiff</h2>
               <span flex></span>
               <md-input-container>
-                <label>editCost</label><input type="number" step="1" name="editCost" ng-model="options.editCost" min="1" max="99999">
+                <label>editCost</label><input type="number" step="1" name="editCost" ng-model="options.editCost" min="1"
+                  max="99999">
               </md-input-container>
             </div>
             <pre class="textdiff" processing-diff left-obj="left" right-obj="right" options="options"></pre>

diff --git a/package.json b/package.json
@@ -25,7 +25,6 @@
   },
   "devDependencies": {
     "angular-mocks": "^1.*",
-    "es6-shim": "^0.35.1",
     "http-server": "^0.9",
     "jasmine-core": "^2.*",
     "karma": "^1.*",

diff --git a/test/diffmatchpatch-spec.js b/test/diffmatchpatch-spec.js
@@ -3,9 +3,9 @@ describe('diff-match-patch', function diffMatchPatchDescription() {
 	var oneLineBasicLeft = 'hello world';
 	var oneLineBasicRight = 'hello';
 	var multiLineLeft = ['I know the kings of England, and I quote the fights historical,',
-					'From Marathon to Waterloo, in order categorical.'].join('\n');
+		'From Marathon to Waterloo, in order categorical.'].join('\n');
 	var multiLineRight = ['I\'m quite adept at funny gags, comedic theory I have read',
-					'From wicked puns and stupid jokes to anvils that drop on your head.'].join('\n');
+		'From wicked puns and stupid jokes to anvils that drop on your head.'].join('\n');
 	var diffRegex = '<span.*?>hello</span><del.*?> world</del>';
 
 	beforeEach(module('diff-match-patch'));
@@ -66,9 +66,17 @@ describe('diff-match-patch', function diffMatchPatchDescription() {
 				$scope.left = ['hello', 'world'].join('\n');
 				$scope.right = ['hello', 'friends!'].join('\n');
 				$scope.options = {
-					attrs: new Map().set('insert', new Map().set('data-attr', 'insert'))
-                        .set('delete', new Map().set('data-attr', 'delete'))
-                        .set('equal', new Map().set('data-attr', 'equal'))
+					attrs: {
+						insert: {
+							'data-attr': 'insert'
+						},
+						delete: {
+							'data-attr': 'delete'
+						},
+						equal: {
+							'data-attr': 'equal'
+						}
+					}
 				};
 
 				$scope.$digest();
@@ -217,9 +225,18 @@ describe('diff-match-patch', function diffMatchPatchDescription() {
 				$scope.left = ['hello', 'world'].join('\n');
 				$scope.right = ['hello', 'friends!'].join('\n');
 				$scope.options = {
-					attrs: new Map().set('insert', new Map().set('data-attr', 'insert').set('class', 'insertion'))
-                        .set('delete', new Map().set('data-attr', 'delete'))
-                        .set('equal', new Map().set('data-attr', 'equal'))
+					attrs: {
+						insert: {
+							'data-attr': 'insert',
+							'class': 'insertion'
+						},
+						delete: {
+							'data-attr': 'delete'
+						},
+						equal: {
+							'data-attr': 'equal'
+						}
+					}
 				};
 
 				$scope.$digest();

diff --git a/test/karma.conf.js b/test/karma.conf.js
@@ -34,7 +34,6 @@ module.exports = function (config) {
 
 		// list of files / patterns to load in the browser
 		files: [
-			'node_modules/es6-shim/es6-shim.min.js',
 			'node_modules/angular/angular.js',
 			'node_modules/angular-mocks/angular-mocks.js',
 			'node_modules/diff-match-patch/index.js',