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

Commit 6d9787e

Browse files
Rémi Becherasdeeg
Rémi Becheras
authored andcommitted
fix: use regular tinymce bower package
Fixes #284 Closes #286
1 parent 15c64f1 commit 6d9787e

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ bower install
1818
grunt
1919
```
2020

21-
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`
21+
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`
2222

2323
# Usage
2424

@@ -39,7 +39,7 @@ bower install
3939
This will copy the ui-tinymce files into your `components` folder, along with its dependencies. Load the script files in your application:
4040

4141
```html
42-
<script type="text/javascript" src="app/bower_components/tinymce-dist/tinymce.js"></script>
42+
<script type="text/javascript" src="app/bower_components/tinymce/tinymce.js"></script>
4343
<script type="text/javascript" src="app/bower_components/angular/angular.js"></script>
4444
<script type="text/javascript" src="app/bower_components/angular-ui-tinymce/src/tinymce.js"></script>
4545
```

bower.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angular-ui-tinymce",
3-
"version": "0.0.16",
3+
"version": "0.0.17",
44
"description": "This directive allows you to TinyMCE in your form.",
55
"author": "https://github.com/angular-ui/ui-tinymce/graphs/contributors",
66
"license": "MIT",
@@ -17,7 +17,7 @@
1717
],
1818
"dependencies": {
1919
"angular": ">=1.4.0",
20-
"tinymce-dist": "~4.3.0"
20+
"tinymce": "~4.4.3"
2121
},
2222
"devDependencies": {
2323
"angular-mocks": "~1.4.x"

demo/demo.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<meta charset="utf-8">
88
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
99
<title>AngularUI - TinyMCE Demo</title>
10-
<script type="text/javascript" src="../bower_components/tinymce-dist/tinymce.min.js"></script>
10+
<script type="text/javascript" src="../bower_components/tinymce/tinymce.min.js"></script>
1111
<script type="text/javascript" src="../bower_components/angular/angular.js"></script>
1212
<script type="text/javascript" src="../src/tinymce.js"></script>
1313
<script type="text/javascript" src="demo.js"></script>

test/karma.conf.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ module.exports = function (config) {
55
files: [
66
'bower_components/angular/angular.js',
77
'bower_components/angular-mocks/angular-mocks.js',
8-
'bower_components/tinymce-dist/tinymce.min.js',
8+
'bower_components/tinymce/tinymce.min.js',
99
'src/tinymce.js',
1010
'test/*.spec.js',
11-
{pattern: 'bower_components/tinymce-dist/themes/**', included: false},
12-
{pattern: 'bower_components/tinymce-dist/skins/lightgray/**', included: false}
11+
{pattern: 'bower_components/tinymce/themes/**', included: false},
12+
{pattern: 'bower_components/tinymce/skins/lightgray/**', included: false}
1313
],
1414
singleRun: false,
1515
autoWatch: true,
1616
browsers: [ 'Chrome' ],
1717
});
18-
};
18+
};

0 commit comments

Comments
 (0)