diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index a5d022b..26931f3 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -17,6 +17,7 @@ Changelog - Enh #91: Update JS dependencies - Fix #59: @ becomes @@ when copying mentioning in wiki editor - Enh #30: Tabulator Support +- Enh #102: Source Button Position 1.1.3 (Unreleased) diff --git a/src/editor/core/menu/index.js b/src/editor/core/menu/index.js index be77a90..60d3cc1 100644 --- a/src/editor/core/menu/index.js +++ b/src/editor/core/menu/index.js @@ -1,2 +1,2 @@ -export * from "./menu" -export {menuBar} from "./menubar" +export * from "./menu"; +export {menuBar} from "./menubar"; diff --git a/src/editor/core/plugins/source/menu.js b/src/editor/core/plugins/source/menu.js index ea4a9f3..d4e2a32 100644 --- a/src/editor/core/plugins/source/menu.js +++ b/src/editor/core/plugins/source/menu.js @@ -18,6 +18,7 @@ const switchMode = function (context) { id: 'source', title: context.translate("Switch editor mode"), icon: icons.markdown, + hideOnCollapse: true, run: (state, dispatch) => { if (isSourceMode(state)) { switchToRichtextMode(context); diff --git a/test/menu/test-menu-accessibility.js b/test/menu/test-menu-accessibility.js index e748564..c765743 100644 --- a/test/menu/test-menu-accessibility.js +++ b/test/menu/test-menu-accessibility.js @@ -61,7 +61,6 @@ describe("Menu:accessibility", () => { navigate(DIR_RIGHT, 'linkItem'); navigate(DIR_RIGHT, 'insertEmoji'); navigate(DIR_RIGHT, 'insert-dropdown'); - navigate(DIR_RIGHT, 'source'); navigate(DIR_RIGHT, 'resizeNav'); done(); }); @@ -70,7 +69,6 @@ describe("Menu:accessibility", () => { initEditor(); focusMenuItem('resizeNav'); expectFocus('resizeNav'); - navigate(DIR_LEFT, 'source'); navigate(DIR_LEFT, 'insert-dropdown'); navigate(DIR_LEFT, 'insertEmoji'); navigate(DIR_LEFT, 'linkItem'); diff --git a/test/plugins/resize_nav/test-resizenav.js b/test/plugins/resize_nav/test-resizenav.js index 74b0c3c..471acc9 100644 --- a/test/plugins/resize_nav/test-resizenav.js +++ b/test/plugins/resize_nav/test-resizenav.js @@ -48,16 +48,16 @@ describe("Plugin:resize_nav", () => { let invisibleOnInit = [ ['helper-group', 'helper-group'], ['format-group', 'format-group'], - ['fullscreen', 'fullScreen'], ['insertTable', 'insertTable'], + ['fullscreen', 'fullScreen'], + ['source', 'source-group'], ]; let visibleOnInit = [ + ['text types', 'type'], ['emoji', 'insertEmoji'], ['insert dropdown', 'insert-dropdown'], ['marks-group', 'marks-group'], - ['text types', 'type'], - ['source', 'source-group'], ['resize nav ', 'resizeNav'], ] diff --git a/test/plugins/source/test-source.js b/test/plugins/source/test-source.js index 05c39a5..a57d5c2 100644 --- a/test/plugins/source/test-source.js +++ b/test/plugins/source/test-source.js @@ -56,6 +56,7 @@ describe("Plugin:source", () => { it("test editor focus on switch mode", (done) => { const editor = initEditor('Test source mode'); + clickMenuItem('resizeNav'); clickMenuItem('source'); expect(editor.hasFocus()).to.be.true; expect(editor.context.$source.is(':focus')).to.be.true;