Merge branch 'gh-pages' of https://github.com/LivelyKernel/lively4-core into gh-pages

Author: BraunTom

src/client/lively.js

@@ -1961,12 +1961,15 @@ export default class Lively {
     if (!evt.shiftKey) { // evt.ctrlKey
       evt.preventDefault();
       evt.stopPropagation();
+      
       // #Hack #Workaround weired browser scrolling behavior
       if (lively.lastScrollLeft || lively.lastScrollTop) {
         document.scrollingElement.scrollTop = lively.lastScrollTop;
         document.scrollingElement.scrollLeft = lively.lastScrollLeft;
       }
 
+      if (self.__preventGlobalContextMenu__) { return; }
+
       var link = Array.from(evt.composedPath()).find(ea => ea.localName == "a")
       if (link) {
         // #TODO can we shorten this or hide this context specific behavior, 

src/client/reactive/components/rewritten/jumping-cubes.js

@@ -8,6 +8,7 @@ import MCTS from './jumping-cubes-mcts.js';
 import Matrix from './square-matrix.js';
 
 import { shake } from 'utils';
+import { fa4 } from 'src/client/utils/font-awesome-utils.js';
 
 class Cube {
 
@@ -588,10 +589,6 @@ export default class JumpingCubes extends Morph {
     evt.stopPropagation();
     evt.preventDefault();
 
-    function fa4(classes) {
-      return '<i class="fa fa-' + classes + '" aria-hidden="true"></i>';
-    }
-
     const players = this.getConfig().players.map((player, index) => {
       function checkIcon(enabled) {
         return enabled ? fa4('check-square-o') : fa4('square-o');

src/client/utils/font-awesome-utils.js

@@ -0,0 +1,4 @@
+
+export function fa4(classes) {
+  return '<i class="fa fa-' + classes + '" aria-hidden="true"></i>';
+}

src/components/tools/lively-sync.js

@@ -31,12 +31,6 @@ export default class Sync extends Morph {
     this.get('#gitrepository').addEventListener("change", evt => this.onGitrepositoryInputChange(evt))
     this.get('#serverUrl').addEventListener("change", evt => this.onServerUrlInputChange(evt))
 
-    
-    var travis = this.get("#travisLink");
-    travis.onclick = () => {
-      window.open(travis.getAttribute("href"));
-      return false;
-    };
     this.updateWindowTitle()
     this.updateServerURL()
   }

src/components/tools/lively-sync.js.l4a

@@ -1,6 +1,8 @@
 import Morph from 'src/components/widgets/lively-morph.js';
 import AcademicSubquery from "src/components/widgets/academic-subquery.js";
 
+var timeout;
+
 export default class AcademicQuery extends Morph {
   constructor() {
     super();
@@ -16,14 +18,17 @@ export default class AcademicQuery extends Morph {
     // irgendwo unter ihm Text ändert
     var observer = new MutationObserver((mutations) => {
       mutations.forEach(async mutation => {
-        //lively.notify("SUPER observation", mutation.type)
-        if (mutation.type == "childList") {
-          if (this.subquery) {
-            this.textContent = await this.subquery.viewToQuery();
-            var input = this.get('#queryInput');
-            input.value = this.getQuery();
+        lively.notify("SUPER observation", mutation.type)
+        clearTimeout(timeout);
+        timeout = setTimeout(async () => {
+          if (mutation.type == "childList") {
+            if (this.subquery) {
+              this.textContent = await this.subquery.viewToQuery();
+              var input = this.get('#queryInput');
+              input.value = this.getQuery();
+            }
           }
-        }
+        }, 1000);
       })
     });
 

src/components/widgets/academic-query.js

@@ -27,7 +27,7 @@
   position: absolute;
   bottom: 125%;
   left: 50%;
-  margin-bottom: -3px;
+  margin-bottom: -4px;
 
   /* Fade in hover */
   opacity: 0;
@@ -39,10 +39,10 @@
 }
 
   .dropTarget {
-    border: 3px solid white;
+    border: 2px solid white;
   }
   .dropTarget.over {
-    border: 3px dotted #666;
+    border: 2px dotted #666;
   }
 
   .queryPart:blank {