Skip to content
This repository has been archived by the owner on Sep 8, 2020. It is now read-only.

Commit

Permalink
fix: use regular tinymce bower package
Browse files Browse the repository at this point in the history
Fixes #284
Closes #286
  • Loading branch information
Rémi Becheras authored and deeg committed Sep 15, 2016
1 parent 15c64f1 commit 6d9787e
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ 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`
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

Expand All @@ -39,7 +39,7 @@ 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-dist/tinymce.js"></script>
<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/src/tinymce.js"></script>
```
Expand Down
4 changes: 2 additions & 2 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "angular-ui-tinymce",
"version": "0.0.16",
"version": "0.0.17",
"description": "This directive allows you to TinyMCE in your form.",
"author": "https://github.com/angular-ui/ui-tinymce/graphs/contributors",
"license": "MIT",
Expand All @@ -17,7 +17,7 @@
],
"dependencies": {
"angular": ">=1.4.0",
"tinymce-dist": "~4.3.0"
"tinymce": "~4.4.3"
},
"devDependencies": {
"angular-mocks": "~1.4.x"
Expand Down
2 changes: 1 addition & 1 deletion demo/demo.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<title>AngularUI - TinyMCE Demo</title>
<script type="text/javascript" src="../bower_components/tinymce-dist/tinymce.min.js"></script>
<script type="text/javascript" src="../bower_components/tinymce/tinymce.min.js"></script>
<script type="text/javascript" src="../bower_components/angular/angular.js"></script>
<script type="text/javascript" src="../src/tinymce.js"></script>
<script type="text/javascript" src="demo.js"></script>
Expand Down
8 changes: 4 additions & 4 deletions test/karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ module.exports = function (config) {
files: [
'bower_components/angular/angular.js',
'bower_components/angular-mocks/angular-mocks.js',
'bower_components/tinymce-dist/tinymce.min.js',
'bower_components/tinymce/tinymce.min.js',
'src/tinymce.js',
'test/*.spec.js',
{pattern: 'bower_components/tinymce-dist/themes/**', included: false},
{pattern: 'bower_components/tinymce-dist/skins/lightgray/**', included: false}
{pattern: 'bower_components/tinymce/themes/**', included: false},
{pattern: 'bower_components/tinymce/skins/lightgray/**', included: false}
],
singleRun: false,
autoWatch: true,
browsers: [ 'Chrome' ],
});
};
};

0 comments on commit 6d9787e

Please sign in to comment.