Merge branch 'master' of github.com:froala/angular-froala

Author: stefanneculai

README.md

@@ -61,7 +61,32 @@ function myCtrl($scope){
 $scope.froalaOptions.froala("getSelection");
 ```
 ###Events
- - todo
+ Events can be used one of two ways as an attribute on the directive, or passed in with the options.
+####Attribute
+_app.js_
+
+```js
+$scope.editorOnFocus = function(e, editor){
+	//Do Something
+}
+```
+_view.html_
+
+```html
+<textarea froala="froalaOptions" ngModel="myHtml" froala-event-focus="editorOnFocus"></textarea>
+```
+###options
+_app.js_
+
+```js
+$scope.froalaOptions = {
+	inlineMode: false,
+	placeholder: "Edit Me",
+	events : {
+		focus : function(e, editor) {/* ... */}
+	}
+```
+ 
 
 ###Displaying Html
 

demo/app.js

@@ -20,11 +20,11 @@
 		};
 
 		$scope.onPaste = function(e, editor, html){
-			return 'Hijacked ' + html;
-		}
+			//return 'Hijacked ' + html;
+		};
 
 		$scope.onEvent = function(e, editor, a, b){
 			console.log('onEvent', e.namespace, a, b);
-		}
+		};
 
 	});

demo/index.html

@@ -12,8 +12,7 @@
   <link rel="stylesheet" href="../bower_components/FroalaWysiwygEditor/css/froala_style.min.css" />
 
   <script src="../bower_components/FroalaWysiwygEditor/js/froala_editor.min.js"></script>
-  <script src="../bower_components/FroalaWysiwygEditor/js/froala_style.min.js"></script>
-  <script src="../bower_components/FroalaWysiwygEditor/js/froala_content.min.js"></script>
+
 	<!-- Froala Plugins -->
   <script src="../bower_components/FroalaWysiwygEditor/js/plugins/tables.min.js"></script>
   <script src="../bower_components/FroalaWysiwygEditor/js/plugins/video.min.js"></script>