Skip to content

Commit

Permalink
Fix CKEditor preview for content that is not wrapped in an HTML tag (#…
Browse files Browse the repository at this point in the history
…782)

* Fix CKEditor preview for content that is not wrapped in an HTML tag

* Make dependency version constraint for "grunt-cli" compatible with npm 1.2.30

* Fix grunt build task

* Set npm version to 10
  • Loading branch information
YetiCGN authored and wachterjohannes committed Mar 7, 2019
1 parent 5b4cceb commit f463544
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
language: node_js
node_js:
- 0.8
- 10

script:
- ./travis_build.sh
- ./travis_build.sh
6 changes: 5 additions & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@ module.exports = function(grunt) {
'use strict';

// load all grunt tasks
require('matchdep').filterDev('grunt-*').forEach(grunt.loadNpmTasks);
require('matchdep').filterDev('grunt-*').forEach(function(name) {
if ('grunt-cli' !== name) {
grunt.loadNpmTasks(name);
}
});

var huskyConfig = grunt.file.readJSON('.grunt/husky.json'),
clone = grunt.util._.clone,
Expand Down
2 changes: 1 addition & 1 deletion dist/husky.js
Original file line number Diff line number Diff line change
Expand Up @@ -43755,7 +43755,7 @@ define('__component__$ckeditor@husky',[], function() {
},

renderStartTemplate: function() {
var $content = $(this.$el.val()),
var $content = $('<body>' + this.$el.val() + '</body>'),
text = $content.text(),
$trigger = $(
[
Expand Down
2 changes: 1 addition & 1 deletion dist/husky.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion husky_components/ckeditor/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ define([], function() {
},

renderStartTemplate: function() {
var $content = $(this.$el.val()),
var $content = $('<body>' + this.$el.val() + '</body>'),
text = $content.text(),
$trigger = $(
[
Expand Down

0 comments on commit f463544

Please sign in to comment.