contextjs show focus again

SQUASHED: contextjs-show-focus-again,
LivelyKernel · Jun 10, 2024 · 773ccfb · 773ccfb
1 parent 893e43e
commit 773ccfb
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 4 deletions.
diff --git a/demos/contextjs/showfocuslayer.md b/demos/contextjs/showfocuslayer.md
@@ -0,0 +1,21 @@
+# ShowFocus Layer
+
+And I wrote it again.... Because I did not look for <edit://demos/contextjs/showfocuslayer.js>  first
+
+```js
+import * as cop  from "src/client/ContextJS/src/contextjs.js";
+
+cop.layer(window, "ShowFocus").refineClass(HTMLElement, {
+
+    focus(...args) {
+      lively.showElement(this)
+      console.log("focus " + this, lively.stack())
+      return cop.proceed(...args)
+    }
+
+})
+
+ShowFocus.beGlobal()
+
+ShowFocus.beNotGlobal()
+```
diff --git a/src/components/widgets/lively-code-mirror.js b/src/components/widgets/lively-code-mirror.js
@@ -1157,7 +1157,7 @@ export default class LivelyCodeMirror extends HTMLElement {
   }
 
   focus() {
-    // lively.notify("[codemirror] focus")
+    lively.notify("[codemirror] focus")
     if (this.editor) {
       // if (this.editor.options.readOnly == "nocursor") {
       //   // console.warn("[lively-code-mirror] prevent focus")

diff --git a/src/systemjs-config.js b/src/systemjs-config.js
@@ -64,7 +64,7 @@ function isWorkspace(load) {
 }
 
 
-const WORKSPACE_REGEX = /^\/?workspace(async)?((js)|(ts))?:/
+const WORKSPACE_REGEX = /^\/?workspace(async)?((js)|(ts)|(mjs))?:/
 
 // export async function locate(load) {
 //   // does the resolving relative workspace urls belong here? 
@@ -623,7 +623,7 @@ orginalResolve = orginalResolve.originalFunction || orginalResolve
 function systemResolve(id, parentUrl) {
   let result
   try {   
-    if (parentUrl && parentUrl.match(/workspace\:/)  &&  id  && id.match(/.*\.((js)|(ts))$/)) {
+    if (parentUrl && parentUrl.match(/workspace\:/)  &&  id  && id.match(/.*\.((js)|(ts)|(mjs))$/)) {
 
       if (id.match(/^[a-zA-Z]/)) {
          // Non relative files
@@ -634,7 +634,7 @@ function systemResolve(id, parentUrl) {
         var baseId = m[1]
         var targetModule = m[2]
 
-        if (targetModule.match(/\.((js)|(ts))$/)) {
+        if (targetModule.match(/\.((js)|(ts)|(mjs))$/)) {
           var protocoll = new URL(lively4url).protocol 
           if (targetModule.match(/^lively-kernel\.org/)) {
               protocoll = "https:" // accessing lively-kernel from localhost....