Skip to content

Commit

Permalink
rename link tables
Browse files Browse the repository at this point in the history
  • Loading branch information
alexander-schranz committed Apr 28, 2015
1 parent de222bd commit ca12c0b
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 9 deletions.
7 changes: 3 additions & 4 deletions dist/husky.js
Original file line number Diff line number Diff line change
Expand Up @@ -40347,7 +40347,7 @@ define('__component__$ckeditor@husky',[], function() {
initializedCallback: null,
instanceName: null,
tableEnabled: true,
linksEnabled: true,
linkEnabled: true,
pasteFromWord: true,
extraAllowedContent: 'img(*)[*]; span(*)[*]; div(*)[*]; iframe(*)[*]; script(*)[*]'
},
Expand Down Expand Up @@ -40410,7 +40410,7 @@ define('__component__$ckeditor@husky',[], function() {
}

// activate embed links
if (this.options.linksEnabled === true) {
if (this.options.linkEnabled === true) {
config.toolbar.push({ name: 'links', items: [ 'Link', 'Unlink' ] });
config.linkShowTargetTab = false;
}
Expand Down Expand Up @@ -40456,7 +40456,7 @@ define('__component__$ckeditor@husky',[], function() {
delete config._ref;
delete config.require;
delete config.element;
delete config.linksEnabled;
delete config.linkEnabled;
delete config.tableEnabled;
delete config.maxHeight;

Expand Down Expand Up @@ -45082,7 +45082,6 @@ define('__component__$data-navigation@husky',[

var configuration = app.sandbox.util.extend(true, {}, getConfig.call(), config),
$editor;

if (!!callback && typeof callback === 'function') {
$editor = $(selector).ckeditor(callback, configuration);
} else {
Expand Down
2 changes: 1 addition & 1 deletion dist/husky.min.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions husky_components/ckeditor/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ define([], function() {
initializedCallback: null,
instanceName: null,
tableEnabled: true,
linksEnabled: true,
linkEnabled: true,
pasteFromWord: true,
extraAllowedContent: 'img(*)[*]; span(*)[*]; div(*)[*]; iframe(*)[*]; script(*)[*]'
},
Expand Down Expand Up @@ -89,7 +89,7 @@ define([], function() {
}

// activate embed links
if (this.options.linksEnabled === true) {
if (this.options.linkEnabled === true) {
config.toolbar.push({ name: 'links', items: [ 'Link', 'Unlink' ] });
config.linkShowTargetTab = false;
}
Expand Down Expand Up @@ -135,7 +135,7 @@ define([], function() {
delete config._ref;
delete config.require;
delete config.element;
delete config.linksEnabled;
delete config.linkEnabled;
delete config.tableEnabled;
delete config.maxHeight;

Expand Down
1 change: 0 additions & 1 deletion husky_extensions/ckeditor-extension.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@

var configuration = app.sandbox.util.extend(true, {}, getConfig.call(), config),
$editor;

if (!!callback && typeof callback === 'function') {
$editor = $(selector).ckeditor(callback, configuration);
} else {
Expand Down

0 comments on commit ca12c0b

Please sign in to comment.