Skip to content

Commit 7d02422

Browse files
committed
Update to use updated version of tinymce
1 parent f1198bb commit 7d02422

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
],
1818
"dependencies": {
1919
"angular": "~1.x",
20-
"tinymce": "git://github.com/jozzhart/tinymce.git#4.0.0"
20+
"tinymce": "git@github.com:spekkionu/tinymce.git#4.0.16"
2121
},
2222
"devDependencies": {
2323
"angular-mocks": "~1.x"

test/karma.conf.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ module.exports = function (config) {
99
'src/tinymce.js',
1010
'test/*.spec.js',
1111
{pattern: 'bower_components/tinymce/themes/modern/theme.min.js', served: true},
12-
{pattern: 'bower_components/tinymce/skins/lightgray/content.min.css', served: true},
13-
{pattern: 'bower_components/tinymce/skins/lightgray/skin.min.css', served: true}
12+
{pattern: 'bower_components/tinymce/skins/lightgray/*', served: true}
1413
],
1514
singleRun: false,
1615
autoWatch: true,

test/tinymce.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ describe('uiTinymce', function () {
6262
it('should remove tinymce instance on $scope destruction', function (done) {
6363
compile();
6464
setTimeout(function () {
65-
expect(tinymce.get('foo')).toBeTruthy();
65+
expect(tinymce.get('foo')).toBeDefined();
6666

6767
scope.$destroy();
6868

0 commit comments

Comments
 (0)