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

Commit 67ca47b

Browse files
committed
Fix karma config load of tinymce
1 parent 0fd33b4 commit 67ca47b

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

src/tinymce.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@
33
*/
44
angular.module('ui.tinymce', [])
55
.value('uiTinymceConfig', {})
6-
.directive('uiTinymce', ['$rootScope', '$window', 'uiTinymceConfig', function ($rootScope, $window, uiTinymceConfig) {
6+
.directive('uiTinymce', ['$rootScope', '$window', 'uiTinymceConfig', function($rootScope, $window, uiTinymceConfig) {
77
uiTinymceConfig = uiTinymceConfig || {};
88
var generatedIds = 0;
99
return {
1010
priority: 10,
1111
require: 'ngModel',
12-
link: function (scope, elm, attrs, ngModel) {
12+
link: function(scope, element, attrs, ngModel) {
1313
if (!$window.tinymce) {
1414
return;
1515
}
1616

1717
var expression, options, tinyInstance,
18-
updateView = function () {
19-
ngModel.$setViewValue(elm.val());
18+
updateView = function() {
19+
ngModel.$setViewValue(element.val());
2020
if (!$rootScope.$$phase) {
2121
scope.$apply();
2222
}
@@ -65,7 +65,7 @@ angular.module('ui.tinymce', [])
6565
}
6666
});
6767
ed.on('blur', function(e) {
68-
elm[0].blur();
68+
element[0].blur();
6969
});
7070
// Update model when an object has been resized (table, image)
7171
ed.on('ObjectResized', function(e) {

test/karma.conf.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ module.exports = function (config) {
55
files: [
66
'bower_components/angular/angular.js',
77
'bower_components/angular-mocks/angular-mocks.js',
8-
'bower_components/tinymce/tinymce.min.js',
8+
'bower_components/tinymce-dist/tinymce.min.js',
99
'src/tinymce.js',
1010
'test/*.spec.js',
1111
{pattern: 'bower_components/tinymce/themes/modern/theme.min.js', served: true},

0 commit comments

Comments
 (0)