Skip to content

Commit

Permalink
New version 3.1.11. Read more https://github.com/xdan/jodit/releases/…
Browse files Browse the repository at this point in the history
  • Loading branch information
xdan committed Jan 16, 2018
1 parent edde778 commit 86d2860
Show file tree
Hide file tree
Showing 7 changed files with 50 additions and 13 deletions.
10 changes: 5 additions & 5 deletions build/jodit.min.css

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions build/jodit.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
}
},
// buttons: ['symbol'],
// disablePlugins: 'mobile'
disablePlugins: 'mobile'
});

function simpleKeys (original) {
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "jodit",
"version": "3.1.10",
"version": "3.1.11",
"description": "Jodit is awesome and usefully wysiwyg editor with filebrowser",
"main": "index.js",
"scripts": {
Expand Down
3 changes: 2 additions & 1 deletion src/Config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -466,7 +466,8 @@ export class Config {
'hr',
'eraser',
'copyformat',
'fullsize'
'fullsize',
'dots'
];

/**
Expand Down
40 changes: 38 additions & 2 deletions test/tests/mobileTest.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,49 @@ describe('Test mobile mode', function () {
describe('Toollbar', function () {
it('Should have different count buttons for different container sizes', function () {
getBox().style.width = '1000px';
var editor = new Jodit(editor_mobile_test);
var editor = new Jodit(editor_mobile_test, {
buttons: [
'source',
'|',
'bold',
'strikethrough',
'underline',
'italic',
'|',
'ul',
'ol',
'|',
'outdent', 'indent',
'|',
'font',
'fontsize',
'brush',
'paragraph',
'|',
'image',
'video',
'table',
'link',
'|',
'align', 'undo', 'redo',
'|',
'hr',
'eraser',
'copyformat',
'|',
'symbol',
'fullsize',
'print',
'about'
]
});

expect(27).to.be.below(editor.container.querySelectorAll('.jodit_toolbar > li').length);

getBox().style.width = '790px';
simulateEvent('resize', 0, window)

expect(27).to.be.above(editor.container.querySelectorAll('.jodit_toolbar > li').length);
expect(28).to.be.above(editor.container.querySelectorAll('.jodit_toolbar > li').length);

getBox().style.width = '690px';
simulateEvent('resize', 0, window)
Expand Down

0 comments on commit 86d2860

Please sign in to comment.