Merge remote-tracking branch 'angular-ui/master'

Conflicts:
	src/tinymce.js

Author: timmipetit

.bowerrc

@@ -0,0 +1,3 @@
+{
+  "directory": "bower_components"
+}

.travis.yml

@@ -1,6 +1,6 @@
 language: node_js
 node_js:
-  - "0.8"
+  - "0.10"
 
 before_install:
   - export DISPLAY=:99.0

README.md

@@ -10,57 +10,70 @@ This directive allows you to add a TinyMCE editor to your form elements.
 # Testing
 
 We use karma and jshint to ensure the quality of the code.  The easiest way to run these checks is to use grunt:
-
-  npm install -g grunt-cli
-  npm install
-  bower install
-  grunt
+```
+npm install -g grunt-cli
+npm install
+bower install
+grunt
+```  
 
 The karma task will try to open Chrome as a browser in which to run the tests.  Make sure this is available or change the configuration in `test\test.config.js` 
 
 # Usage
 
 We use [bower](http://twitter.github.com/bower/) for dependency management.  Add
 
-    dependencies: {
-        "angular-ui-tinymce": "latest"
-    }
+```
+dependencies: {
+"angular-ui-tinymce": "latest"
+}
+```
 
 To your `bower.json` file. Then run
 
-    bower install
+```
+bower install
+```
 
 This will copy the ui-tinymce files into your `components` folder, along with its dependencies. Load the script files in your application:
 
-    <script type="text/javascript" src="components/tinymce/tinymce.js"></script>
-    <script type="text/javascript" src="components/angular/angular.js"></script>
-    <script type="text/javascript" src="components/angular-ui-tinymce/tinymce.js"></script>
+```html
+<script type="text/javascript" src="app/bower_components/tinymce/tinymce.js"></script>
+<script type="text/javascript" src="app/bower_components/angular/angular.js"></script>
+<script type="text/javascript" src="app/bower_components/angular-ui-tinymce/tinymce.js"></script>
+```
 
 Add the tinymce module as a dependency to your application module:
 
-    var myAppModule = angular.module('MyApp', ['ui.tinymce'])
+```javascript
+var myAppModule = angular.module('MyApp', ['ui.tinymce'])
+```
 
 Apply the directive to your form elements:
 
-    <form method="post">
-      <textarea ui-tinymce ng-model="tinymceModel"></textarea>
-    </form>
-
+```html
+<form method="post">
+	<textarea ui-tinymce ng-model="tinymceModel"></textarea>
+</form>
+```
 ## Options
 
 All the TinyMCE options can be passed through the directive.
 
-	myAppModule.controller('MyController', function($scope) {
-		$scope.tinymceOptions = {
-			handle_event_callback: function (e) {
-        // put logic here for keypress
-      }
-		};
-	});
-
-    <form method="post">
-      <textarea ui-tinymce="tinymceOptions" ng-model="tinymceModel"></textarea>
-    </form>
+```javascript
+myAppModule.controller('MyController', function($scope) {
+	$scope.tinymceOptions = {
+		handle_event_callback: function (e) {
+		// put logic here for keypress
+		}
+	};
+});
+```
+```html
+<form method="post">
+	<textarea ui-tinymce="tinymceOptions" ng-model="tinymceModel"></textarea>
+</form>
+```    
 
 ## Working with ng-model
 

bower.json

@@ -17,7 +17,7 @@
   ],
   "dependencies": {
     "angular": "~1.x",
-    "tinymce": "git://github.com/jozzhart/tinymce.git#4.0.0"
+    "tinymce": "git@github.com:jozzhart/tinymce.git#4.0.22"
   },
   "devDependencies": {
     "angular-mocks": "~1.x"

gruntFile.js

@@ -1,23 +1,20 @@
 module.exports = function (grunt) {
 
-  grunt.loadNpmTasks('grunt-karma');
-  grunt.loadNpmTasks('grunt-contrib-jshint');
+  require('load-grunt-tasks')(grunt);
 
   // Default task.
   grunt.registerTask('default', ['jshint', 'karma']);
 
   var karmaConfig = function(configFile, customOptions) {
-    var options = { configFile: configFile, keepalive: true };
+    var options = { configFile: configFile, singleRun: true };
     var travisOptions = process.env.TRAVIS && { browsers: ['Firefox'], reporters: 'dots' };
     return grunt.util._.extend(options, customOptions, travisOptions);
   };
 
   // Project configuration.
   grunt.initConfig({
     karma: {
-      unit: {
-        options: karmaConfig('test/test.conf.js')
-      }
+      unit: karmaConfig('test/karma.conf.js')
     },
     jshint:{
       files:['src/**/*.js', 'test/**/*.js', 'demo/**/*.js'],
@@ -33,7 +30,12 @@ module.exports = function (grunt) {
         eqnull:true,
         globals:{}
       }
+    },
+    changelog: {
+      options: {
+        dest: 'CHANGELOG.md'
+      }
     }
   });
 
-};
+};

package.json

@@ -1,16 +1,21 @@
 {
   "name": "angular-ui-tinymce",
-  "version": "0.0.3",
+  "version": "0.0.5",
   "description": "This directive allows you to add a tinymce to your form elements.",
   "author": "https://github.com/angular-ui/ui-tinymce/graphs/contributors",
   "license": "MIT",
   "homepage": "http://angular-ui.github.com",
   "main": "src/tinymce.js",
   "dependencies": {},
   "devDependencies": {
-    "grunt": "~0.4.1",
-    "grunt-karma": "~0.4.4",
-    "grunt-contrib-jshint": "~0.2.0"
+    "grunt": "~0.4.4",
+    "grunt-karma": "~0.8.2",
+    "grunt-contrib-jshint": "~0.10.0",
+    "grunt-conventional-changelog": "~1.0.0",
+    "karma-jasmine": "~0.2.2",
+    "karma-chrome-launcher": "~0.1.3",
+    "karma-firefox-launcher": "~0.1.3",
+    "load-grunt-tasks": "~0.2.0"
   },
   "scripts": {},
   "repository": {

src/tinymce.js

@@ -29,12 +29,19 @@ angular.module('ui.tinymce', [])
           expression = {};
         }
 
+        // make config'ed setup method available
+        if (expression.setup) {
+          var configSetup = expression.setup;
+          delete expression.setup;
+        }
+
         options = {
           // Update model when calling setContent (such as from the source editor popup)
           setup: function (ed) {
             var args;
             ed.on('init', function(args) {
               ngModel.$render();
+              ngModel.$setPristine();
             });
             // Update model on button click
             ed.on('ExecCommand', function (e) {
@@ -48,14 +55,21 @@ angular.module('ui.tinymce', [])
             });
             // Update model on change, i.e. copy/pasted text, plugins altering content
             ed.on('SetContent', function (e) {
-              if(!e.initial){
+              if (!e.initial && ngModel.$viewValue !== e.content) {
                 ed.save();
                 updateView();
               }
             });
-            if (expression.setup) {
-              scope.$eval(expression.setup);
-              delete expression.setup;
+            ed.on('blur', function(e) {
+                elm.blur();
+            });
+            // Update model when an object has been resized (table, image)
+            ed.on('ObjectResized', function (e) {
+              ed.save();
+              updateView();
+            });
+            if (configSetup) {
+              configSetup(ed);
             }
           },
           mode: 'exact',

test/karma.conf.js

@@ -0,0 +1,18 @@
+module.exports = function (config) {
+  config.set({
+    basePath: '..',
+    frameworks: ['jasmine'],
+    files: [
+      'bower_components/angular/angular.js',
+      'bower_components/angular-mocks/angular-mocks.js',
+      'bower_components/tinymce/tinymce.min.js',
+      'src/tinymce.js',
+      'test/*.spec.js',
+      {pattern: 'bower_components/tinymce/themes/modern/theme.min.js', served: true},
+      {pattern: 'bower_components/tinymce/skins/lightgray/*', served: true}
+    ],
+    singleRun: false,
+    autoWatch: true,
+    browsers: [ 'Chrome' ],
+  });
+};