Merge pull request #182 from angular-ui/dev

Updating v10 candidate to include latest dev changes.

Author: deeg

.gitignore

@@ -1,2 +1,4 @@
 bower_components/
-node_modules/
+node_modules/
+/*.iml
+/.idea

README.md

@@ -38,9 +38,9 @@ bower install
 This will copy the ui-tinymce files into your `components` folder, along with its dependencies. Load the script files in your application:
 
 ```html
-<script type="text/javascript" src="app/bower_components/tinymce/tinymce.js"></script>
+<script type="text/javascript" src="app/bower_components/tinymce-dist/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>
+<script type="text/javascript" src="app/bower_components/angular-ui-tinymce/src/tinymce.js"></script>
 ```
 
 Add the tinymce module as a dependency to your application module:
@@ -99,4 +99,4 @@ myAppModule.controller('MyController', function($scope) {
 <form method="post">
   <textarea ui-tinymce="tinymceOptions" ng-model="tinymceModel"></textarea>
 </form>
-```documentation
+```

bower.json

@@ -17,7 +17,7 @@
   ],
   "dependencies": {
     "angular": "~1.x",
-    "tinymce-dist": "~4.1.0"
+    "tinymce-dist": "~4.2.0"
   },
   "devDependencies": {
     "angular-mocks": "~1.x"

src/tinymce.js

@@ -21,7 +21,7 @@ angular.module('ui.tinymce', [])
         var ngModel = ctrls[0],
           form = ctrls[1] || null;
 
-        var expression, options, tinyInstance,
+        var expression, options = {}, tinyInstance,
           updateView = function(editor) {
             var content = editor.getContent({format: options.format}).trim();
             content = $sce.trustAsHtml(content);
@@ -55,7 +55,7 @@ angular.module('ui.tinymce', [])
 
         angular.extend(expression, scope.$eval(attrs.uiTinymce));
 
-        options = {
+        var setupOptions = {
           // Update model when calling setContent
           // (such as from the source editor popup)
           setup: function(ed) {
@@ -74,7 +74,7 @@ angular.module('ui.tinymce', [])
             });
 
             // Update model on change
-            ed.on('change', function(e) {
+            ed.on('change', function() {
               ed.save();
               updateView(ed);
             });
@@ -99,12 +99,12 @@ angular.module('ui.tinymce', [])
               });
             }
           },
-          format: 'raw',
+          format: expression.format || 'html',
           selector: '#' + attrs.id
         };
         // extend options with initial uiTinymceConfig and
         // options from directive attribute value
-        angular.extend(options, uiTinymceConfig, expression);
+        angular.extend(options, uiTinymceConfig, expression, setupOptions);
         // Wrapped in $timeout due to $tinymce:refresh implementation, requires
         // element to be present in DOM before instantiating editor when
         // re-rendering directive

test/tinymce.spec.js

@@ -23,7 +23,7 @@ describe('uiTinymce', function () {
    * Asynchronously runs the compilation.
    */
   function compile() {
-    element = $compile('<form><textarea ui-tinymce="{foo: \'bar\', setup: setupFooBar() }" ng-model="foo"></textarea></form>')(scope);
+    element = $compile('<form><textarea ui-tinymce="{foo: \'bar\', setup: setupFooBar }" data-ng-model="foo"></textarea></form>')(scope);
     angular.element(document.getElementsByTagName('body')[0]).append(element);
     scope.$apply();
     $timeout.flush();
@@ -53,10 +53,15 @@ describe('uiTinymce', function () {
       expect(tinymce.init.calls.mostRecent().args[0].tinymce.bar).toBe('baz');
     });
 
-    it('should execute the passed `setup` option', function() {
+    it('should execute the passed `setup` option', function(done) {
       scope.setupFooBar = jasmine.createSpy('setupFooBar');
       compile();
-      expect(scope.setupFooBar).toHaveBeenCalled();
+
+      //TODO: Get rid of timeout
+      setTimeout(function() {
+        expect(scope.setupFooBar).toHaveBeenCalled();
+        done();
+      }, 100);
     });
   });