Merge branch 'rangy-official' of https://github.com/FronterAS/textAng…

…ular Conflicts: bower.json
joeprisk · Jan 21, 2015 · ade14e4 · ade14e4
2 parents f0d3baf + c172206
commit ade14e4
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 36 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -114,7 +114,7 @@ module.exports = function (grunt) {
 			},
 			my_target: {
 				files: {
-					'dist/textAngular-rangy.min.js': ['bower_components/rangy/rangy-core.js', 'bower_components/rangy/rangy-selectionsaverestore.js'],
+					'dist/textAngular-rangy.min.js': ['bower_components/rangy-official/rangy-core.js', 'bower_components/rangy-official/rangy-selectionsaverestore.js'],
 					'dist/textAngular.min.js': ['src/textAngularSetup.js','src/textAngular.js'],
 					'dist/textAngular-sanitize.min.js': ['src/textAngular-sanitize.js']
 				}
@@ -125,4 +125,4 @@ module.exports = function (grunt) {
 			tasks: "concat"
 		}
 	});
-};
+};
diff --git a/bower.json b/bower.json
@@ -1,7 +1,13 @@
 {
   "name": "textAngular",
   "version": "1.3.0-23",
-  "main": ["./dist/textAngular.minjs", "./dist/textAngular-sanitize.minjs", "./src/textAngular.css", "./dist/textAngular-rangy.min.js"],
+  "main": [
+    "./src/textAngular.js",
+    "./src/textAngular-sanitize.js",
+    "./src/textAngularSetup.js",
+    "./src/textAngular.css",
+    "../rangy-official/rangy-selectionsaverestore.js"
+  ],
   "description": "A radically powerful Text-Editor/Wysiwyg editor for Angular.js",
   "keywords": [
     "editor",
@@ -20,9 +26,9 @@
   ],
   "dependencies": {
     "angular": "^1.2.x",
-    "rangy": "^1.2.0",
     "bootstrap": "^3.0.x",
-    "font-awesome": "^4.0.x"
+    "font-awesome": "^4.0.x",
+    "rangy-official": "^1.3.0"
   },
   "devDependencies": {
     "angular-mocks": "~1.2.x",

diff --git a/dist/textAngular-rangy.min.js b/dist/textAngular-rangy.min.js
diff --git a/karma-jqlite.conf.js b/karma-jqlite.conf.js
@@ -12,8 +12,8 @@ module.exports = function (config) {
 		],
 
 		files: [
-			'bower_components/rangy/rangy-core.js',
-			'bower_components/rangy/rangy-selectionsaverestore.js',
+			'bower_components/rangy-official/rangy-core.js',
+			'bower_components/rangy-official/rangy-selectionsaverestore.js',
 			'bower_components/angular/angular.min.js',
 			'bower_components/angular-mocks/angular-mocks.js',
 			'src/textAngular-sanitize.js',
@@ -84,4 +84,4 @@ module.exports = function (config) {
 		// if true, it capture browsers, run tests and exit
 		singleRun: true
 	});
-};
+};
diff --git a/karma-jquery.conf.js b/karma-jquery.conf.js
@@ -13,8 +13,8 @@ module.exports = function (config) {
 
 		files: [
 			'bower_components/jquery/jquery.min.js',
-			'bower_components/rangy/rangy-core.js',
-			'bower_components/rangy/rangy-selectionsaverestore.js',
+			'bower_components/rangy-official/rangy-core.js',
+			'bower_components/rangy-official/rangy-selectionsaverestore.js',
 			'bower_components/angular/angular.min.js',
 			'bower_components/angular-mocks/angular-mocks.js',
 			'src/textAngular-sanitize.js',
@@ -84,4 +84,4 @@ module.exports = function (config) {
 		// if true, it capture browsers, run tests and exit
 		singleRun: true
 	});
-};
+};