Merge pull request #11 from shashankaccolite/v.3

dheerajaccolite · web-flow · commit 96fb73759dab · 2019-04-08T11:38:41.000+05:30
Jquery references removed.
diff --git a/.jshintrc b/.jshintrc
@@ -20,7 +20,6 @@
   "browser": true,
   "devel": true,
   "jasmine": true,
-  "jquery": true,
   // Custom Globals
   "globals": {
     "module": true,
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -29,7 +29,6 @@ module.exports = function(grunt) {
                     browsers: ['PhantomJS'],
                     files: [
                         'node_modules/sinon/pkg/sinon.js',
-                        'bower_components/jquery/dist/jquery.js',
                         'bower_components/angular/angular.js',
                         'bower_components/angular-mocks/angular-mocks.js',
                         'src/**/*.js',
diff --git a/bower.json b/bower.json
@@ -13,12 +13,10 @@
     "text",
     "editor",
     "wysiwyg",
-    "jquery-plugin",
     "rich editor",
     "rich text editor",
     "rte",
     "javascript",
-    "jquery"
   ],
   "license": "MIT",
   "ignore": [
diff --git a/demo/app.js b/demo/app.js
@@ -13,7 +13,7 @@
 			charCounterCount: false,
 			toolbarInline: true,
 			events: {
-				'froalaEditor.initialized': function() {
+				'initialized': function() {
 					console.log('initialized');
 				}
 			}
@@ -22,7 +22,7 @@
 		$scope.initialize = function(initControls) {
 			$scope.initControls = initControls;
 			$scope.deleteAll = function() {
-				initControls.getEditor()('html.set', '');
+				initControls.getEditor().html.set('');
 			};
 		};
 
diff --git a/demo/index.html b/demo/index.html
@@ -6,12 +6,8 @@
 <head>
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, height=device-height, initial-scale=1.0, maximum-scale=1.0"/>
-  <script src="../bower_components/jquery/dist/jquery.min.js"></script>
 
-  <!-- Include Font Awesome. -->
-  <link href="../node_modules/font-awesome/css/font-awesome.min.css" rel="stylesheet" type="text/css" />
-
-	<!-- Include Froala Editor styles -->
+  <!-- Include Froala Editor styles -->
   <link rel="stylesheet" href="../bower_components/froala-wysiwyg-editor/css/froala_editor.min.css" />
   <link rel="stylesheet" href="../bower_components/froala-wysiwyg-editor/css/froala_style.min.css" />
 
@@ -29,7 +25,7 @@
   <link rel="stylesheet" href="../bower_components/froala-wysiwyg-editor/css/plugins/video.css">
 
 	<!-- Include Froala Editor -->
-  <script src="../bower_components/froala-wysiwyg-editor/js/froala_editor.min.js"></script>
+  <script src="../bower_components/froala-wysiwyg-editor/js/froala_editor.pkgd.min.js"></script>
 
 	<!-- Include Froala Editor Plugins -->
   <script src="../bower_components/froala-wysiwyg-editor/js/plugins/align.min.js"></script>
@@ -58,7 +54,6 @@
 	<!-- End Froala -->
 
   <script src="../bower_components/angular/angular.min.js"></script>
-
   <script src="../src/angular-froala.js"></script>
   <script src="app.js"></script>
   <link rel="stylesheet" href="app.css">
diff --git a/package.json b/package.json
@@ -17,12 +17,10 @@
     "text",
     "editor",
     "wysisyg",
-    "jquery-plugin",
     "rich editor",
     "rich text editor",
     "rte",
     "javascript",
-    "jquery"
   ],
   "contributors": [
     "Cameron Gallarno <cgallarno@gmail.com>",
diff --git a/src/angular-froala.js b/src/angular-froala.js
@@ -1,4 +1,4 @@
-(function(window, angular, jQuery, undefined) {
+(function(window, angular, undefined) {
   'use strict';
 
   angular.module('froala', [])
@@ -30,13 +30,12 @@
         require: 'ngModel',
         scope: scope,
         link: function(scope, element, attrs, ngModel) {
-          if (jQuery){ element = jQuery(element); 
             // Create a blur event to update the data of ngModel
             element.on('blur', function () {
               ngModel.$setViewValue(element.innerHTML.text())
             });
           
-          }
+        
           var specialTag = false;
           if (SPECIAL_TAGS.indexOf(element.prop("tagName").toLowerCase()) != -1) {
             specialTag = true;
@@ -95,10 +94,6 @@
                 return true;
               }
 
-              if (ctrl.editorInitialized) {
-                return element.froalaEditor.node.isEmpty(jQuery('<div>' + value + '</div>')).get(0);
-              }
-
               return true;
             };
           };
@@ -238,4 +233,4 @@
         }
       };
     }]);
-})(window, window.angular, window.jQuery);
+})(window, window.angular);
