From 3dbced46f1b08f3f2d9d85fc9591accccebff450 Mon Sep 17 00:00:00 2001 From: ClemDee Date: Wed, 5 Jun 2019 14:28:06 +0200 Subject: [PATCH 1/4] Add theme overview on hover --- www/common/sframe-common-codemirror.js | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/www/common/sframe-common-codemirror.js b/www/common/sframe-common-codemirror.js index 8fd886fec..a88059edc 100644 --- a/www/common/sframe-common-codemirror.js +++ b/www/common/sframe-common-codemirror.js @@ -272,12 +272,26 @@ define([ setTheme(lastTheme, $block); - $block.find('a').click(function () { + var isHovering = false; + var $aThemes = $block.find('a'); + $aThemes.mouseenter(function () { + isHovering = true; + var theme = $(this).attr('data-value'); + setTheme(theme, $block); + }); + $aThemes.mouseleave(function () { + if (isHovering) { + setTheme(lastTheme, $block); + Common.setAttribute(themeKey, lastTheme); + } + }); + $aThemes.click(function () { + isHovering = false; var theme = $(this).attr('data-value'); setTheme(theme, $block); Common.setAttribute(themeKey, theme); }); - + if ($drawer) { $drawer.append($block); } if (cb) { cb(); } }; From dc7f39707277f10986f4709d9d8948e8993b9aca Mon Sep 17 00:00:00 2001 From: ClemDee Date: Wed, 5 Jun 2019 15:08:24 +0200 Subject: [PATCH 2/4] Add language overview on hover --- www/common/sframe-common-codemirror.js | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/www/common/sframe-common-codemirror.js b/www/common/sframe-common-codemirror.js index a88059edc..3636e5b6c 100644 --- a/www/common/sframe-common-codemirror.js +++ b/www/common/sframe-common-codemirror.js @@ -231,7 +231,20 @@ define([ }; var $block = exp.$language = UIElements.createDropdown(dropdownConfig); $block.find('button').attr('title', Messages.languageButtonTitle); - $block.find('a').click(function () { + + var isHovering = false; + var $aLanguages = $block.find('a'); + $aLanguages.mouseenter(function () { + isHovering = true; + setMode($(this).attr('data-value')); + }); + $aLanguages.mouseleave(function () { + if (isHovering) { + setMode($block.find(".cp-dropdown-element-active").attr('data-value')); + } + }); + $aLanguages.click(function () { + isHovering = false; setMode($(this).attr('data-value'), onModeChanged); onLocal(); }); From 6302d9a7303f011a756c833ea311dfe6d8522761 Mon Sep 17 00:00:00 2001 From: ClemDee Date: Thu, 6 Jun 2019 10:45:02 +0200 Subject: [PATCH 3/4] Allow user to change theme in slide --- www/slide/inner.js | 1 + 1 file changed, 1 insertion(+) diff --git a/www/slide/inner.js b/www/slide/inner.js index 6da8072c3..1be2e5f3b 100644 --- a/www/slide/inner.js +++ b/www/slide/inner.js @@ -458,6 +458,7 @@ define([ mkHelpMenu(framework); CodeMirror.mkIndentSettings(framework._.cpNfInner.metadataMgr); + CodeMirror.init(framework.localChange, framework._.title, framework._.toolbar); CodeMirror.configureTheme(common); framework.onContentUpdate(function (newContent) { From a2997c4d53ed536e8d77474d634fc1355c5512ad Mon Sep 17 00:00:00 2001 From: ClemDee Date: Thu, 6 Jun 2019 10:47:07 +0200 Subject: [PATCH 4/4] Fix cursor to pointer on theme/language buttons in pads --- customize.dist/src/less2/include/dropdown.less | 1 - 1 file changed, 1 deletion(-) diff --git a/customize.dist/src/less2/include/dropdown.less b/customize.dist/src/less2/include/dropdown.less index e937142e3..7c316a33a 100644 --- a/customize.dist/src/less2/include/dropdown.less +++ b/customize.dist/src/less2/include/dropdown.less @@ -22,7 +22,6 @@ } * { .tools_unselectable(); - cursor: default; } }