Merge pull request #205 from angular-ui/dev

Merging dev with master branch for release .12

Author: deeg

CONTRIBUTING.md

@@ -30,7 +30,16 @@ We are always looking for the quality contributions and will be happy to accept
 
 * Please open all pull requests against the `dev` branch.
 * Please assure that you are submitting quality code, specifically make sure that:
-  * You have accompanying tests and all the tests are passing.
+  * You have accompanying tests and all the tests are passing.  See testing below.
   * Your PR doesn't break the build; check the Travis-CI build status after opening a PR and push corrective commits if anything goes wrong
   * You are using 2 space indentation
-  * Your commits conform to the conventions established [here](https://github.com/ajoslin/conventional-changelog/blob/master/conventions/angular.md)
+  * Your commits conform to the conventions established [here](https://github.com/ajoslin/conventional-changelog/blob/master/conventions/angular.md)
+
+
+## Testing
+To run tests:
+```bash
+$ npm install
+$ bower install
+$ grunt
+```

README.md

@@ -98,6 +98,7 @@ In addition, it supports these additional optional options
 
 - `format` Format to get content as, i.e. 'raw' for raw HTML, or 'text' for text only. Defaults to 'html'. Documentation [here](http://www.tinymce.com/wiki.php/api4:method.tinymce.Editor.getContent)
 - `trusted` When `true`, all TinyMCE content that is set to `ngModel` will be whitelisted by `$sce`
+- `baseURL` This will set [baseURL property on the EditorManager](https://www.tinymce.com/docs/api/class/tinymce.editormanager/)
 
 This option is only supported when present on the `uiTinymceConfig` global injectable - this injectable needs to be an object.
 

package.json

@@ -10,6 +10,7 @@
   "devDependencies": {
     "grunt": "~0.4.4",
     "grunt-karma": "~0.8.2",
+    "karma": "~0.12.0",
     "grunt-contrib-jshint": "~0.10.0",
     "grunt-conventional-changelog": "~1.0.0",
     "jasmine-core": "~2.3.4",

src/tinymce.js

@@ -109,6 +109,9 @@ angular.module('ui.tinymce', [])
         // element to be present in DOM before instantiating editor when
         // re-rendering directive
         $timeout(function() {
+          if (options.baseURL){
+            tinymce.baseURL = options.baseURL;            
+          }
           tinymce.init(options);
           toggleDisable(scope.$eval(attrs.ngDisabled));
         });