Skip to content

Commit

Permalink
3.1.1
Browse files Browse the repository at this point in the history
  • Loading branch information
angrybrad committed Aug 17, 2018
1 parent aa46075 commit 3e18405
Show file tree
Hide file tree
Showing 56 changed files with 1,747 additions and 815 deletions.
3 changes: 2 additions & 1 deletion lib/redactor-plugins/alignment/alignment.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
init: function(app)
{
this.app = app;
this.opts = app.opts;
this.lang = app.lang;
this.block = app.block;
this.toolbar = app.toolbar;
Expand All @@ -33,7 +34,7 @@
},
set: function(type)
{
if (type === 'left')
if (type === 'left' && this.opts.direction === 'ltr')
{
return this._remove();
}
Expand Down
2 changes: 1 addition & 1 deletion lib/redactor-plugins/alignment/alignment.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions lib/redactor-plugins/counter/counter.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
var $editor = this.editor.getElement();
$editor.off('.redactor-plugin-counter');

this.statusbar.removeItem('words');
this.statusbar.removeItem('chars');
this.statusbar.remove('words');
this.statusbar.remove('chars');
},
count: function()
{
Expand Down
2 changes: 1 addition & 1 deletion lib/redactor-plugins/counter/counter.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 6 additions & 5 deletions lib/redactor-plugins/definedlinks/definedlinks.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,9 @@
{
$R.ajax.get({
url: this.opts.definedlinks,
success: this._parse.bind(this)
success: this._build.bind(this)
});
}
},
_parse: function(json)
{
this._build(JSON.parse(json));
},
_build: function(data)
{
Expand All @@ -65,6 +61,11 @@

for (var key in data)
{
if (!data.hasOwnProperty(key) || typeof data[key] !== 'object')
{
continue;
}

this.links[key] = data[key];

var $option = $R.dom('<option>');
Expand Down
2 changes: 1 addition & 1 deletion lib/redactor-plugins/definedlinks/definedlinks.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions lib/redactor-plugins/filemanager/filemanager.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,13 @@
success: this._parse.bind(this)
});
},
_parse: function(json)
_parse: function(data)
{
var data = JSON.parse(json);

var $ul = $R.dom('<ul id="redactor-filemanager-list">');
for (var key in data)
{
var obj = data[key];
if (typeof obj !== 'object') continue;

var $li = $R.dom('<li>');
var $item = $R.dom('<a>');
Expand Down
2 changes: 1 addition & 1 deletion lib/redactor-plugins/filemanager/filemanager.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions lib/redactor-plugins/fullscreen/fullscreen.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,7 @@
// make sure that the fullscreen modal is at the end of the DOM
this.$target.append($container);
/* END HACK */

this.$target.addClass('redactor-body-fullscreen');
this.$target.addClass('redactor-body-fullscreen');

$container.addClass('redactor-box-fullscreen');
if (this.isTarget) $container.addClass('redactor-box-fullscreen-target');
Expand Down
2 changes: 1 addition & 1 deletion lib/redactor-plugins/fullscreen/fullscreen.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions lib/redactor-plugins/imagemanager/imagemanager.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,13 @@
success: this._parse.bind(this)
});
},
_parse: function(json)
_parse: function(data)
{
var data = JSON.parse(json);

for (var key in data)
{
var obj = data[key];
if (typeof obj !== 'object') continue;

var $img = $R.dom('<img>');
var url = (obj.thumb) ? obj.thumb : obj.url;

Expand Down
2 changes: 1 addition & 1 deletion lib/redactor-plugins/imagemanager/imagemanager.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 3e18405

Please sign in to comment.