Merge pull request #46 from bisubus/master

jQuery-related fixes - Looks good. Thanks!
TylerGarlick · Jun 16, 2015 · 708eaaf · 708eaaf
2 parents b54a79d + 5a967dc
commit 708eaaf
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/angular-redactor-9.x.js b/angular-redactor-9.x.js
@@ -35,8 +35,7 @@
                         },
                         additionalOptions = attrs.redactor ?
                             scope.$eval(attrs.redactor) : {},
-                        editor,
-                        $_element = angular.element(element);
+                        editor;
 
                     angular.extend(options, redactorOptions, additionalOptions);
 
@@ -51,14 +50,14 @@
                     // put in timeout to avoid $digest collision.  call render() to
                     // set the initial value.
                     $timeout(function() {
-                        editor = $_element.redactor(options);
+                        editor = element.redactor(options);
                         ngModel.$render();
                     });
 
                     ngModel.$render = function() {
                         if(angular.isDefined(editor)) {
                             $timeout(function() {
-                                $_element.redactor('set', ngModel.$viewValue || '');
+                                element.redactor('set', ngModel.$viewValue || '');
                                 scope.redactorLoaded = true;
                             });
                         }

diff --git a/angular-redactor.js b/angular-redactor.js
@@ -35,8 +35,7 @@
                         },
                         additionalOptions = attrs.redactor ?
                             scope.$eval(attrs.redactor) : {},
-                        editor,
-                        $_element = angular.element(element);
+                        editor;
 
                     angular.extend(options, redactorOptions, additionalOptions);
 
@@ -52,7 +51,7 @@
                     // put in timeout to avoid $digest collision.  call render() to
                     // set the initial value.
                     $timeout(function() {
-                        editor = $_element.redactor(options);
+                        editor = element.redactor(options);
                         ngModel.$render();
                         element.on('remove',function(){
                             element.off('remove');
@@ -63,8 +62,8 @@
                     ngModel.$render = function() {
                         if(angular.isDefined(editor)) {
                             $timeout(function() {
-                                $_element.redactor('code.set', ngModel.$viewValue || '');
-                                $_element.redactor('placeholder.toggle');
+                                element.redactor('code.set', ngModel.$viewValue || '');
+                                element.redactor('placeholder.toggle');
                                 scope.redactorLoaded = true;
                             });
                         }

diff --git a/bower.json b/bower.json
@@ -24,7 +24,7 @@
     "tests"
   ],
   "dependencies": {
-    "jquery": ">=2.0.0",
+    "jquery": "^2.0.0 || ^1.9.0",
     "angular": ">=1.2.0"
   },
   "devDependencies": {