linny-r 1.4.1 → 1.4.3

package/static/linny-r.css

@@ -288,6 +288,11 @@ img.blink {
   animation: blink 1s step-start 0s infinite;
 }
 
+#stop-btn.blink {
+  cursor: default;
+  pointer-events: none;
+}
+
 img.mbtn {
   width: 21px;
   height: 21px;
@@ -346,20 +351,6 @@ div.contbtn {
   cursor: pointer;
 }
 
-div.simbtn {
-  display: none;
-  margin-left: 5px;
-}
-
-img.sim {
-  height: 14px;
-  width: 14px;  
-}
-
-img.sim.enab:hover {
-  background-color: #9e96e5;
-}
-
 input {
   vertical-align: baseline;
 }
@@ -4283,6 +4274,17 @@ img.finder {
   width: 50%;
 }
 
+/* NOTE: Finder buttons are initially invisible */
+
+#finder-edit-btn {
+  position: absolute;
+  height: 16px;
+  width: 16px;
+  bottom: 1px;
+  right: calc(50% + 24px);
+  display: none;
+}
+
 #finder-copy-btn {
   position: absolute;
   height: 16px;
@@ -4770,372 +4772,24 @@ div.call-stack-expr {
   padding-bottom: 3px;
 }
 
-/* Linny-R logo icon animation in 60 frames */
-
-#fr00 {
-  visibility: hidden;
-  animation: 3s show infinite;
-  animation-delay: 0.05s;
-}
-
-#fr01 {
-  visibility: hidden;
-  animation: 3s show infinite;
-  animation-delay: 0.1s;
-}
-
-#fr02 {
-  visibility: hidden;
-  animation: 3s show infinite;
-  animation-delay: 0.15s;
-}
-
-#fr03 {
-  visibility: hidden;
-  animation: 3s show infinite;
-  animation-delay: 0.2s;
-}
+/* The UPDATING modal notifies that update is in progress */
 
-#fr04 {
-  visibility: hidden;
-  animation: 3s show infinite;
-  animation-delay: 0.25s;
+#updating-dlg {
+  width: 325px;
+  height: 85px;  
 }
 
-#fr05 {
-  visibility: hidden;
-  animation: 3s show infinite;
-  animation-delay: 0.3s;
-}
-
-#fr06 {
-  visibility: hidden;
-  animation: 3s show infinite;
-  animation-delay: 0.35s;
-}
-
-#fr07 {
-  visibility: hidden;
-  animation: 3s show infinite;
-  animation-delay: 0.4s;
-}
-
-#fr08 {
-  visibility: hidden;
-  animation: 3s show infinite;
-  animation-delay: 0.45s;
-}
-
-#fr09 {
-  visibility: hidden;
-  animation: 3s show infinite;
-  animation-delay: 0.5s;
-}
-
-#fr10 {
-  visibility: hidden;
-  animation: 3s show infinite;
-  animation-delay: 0.55s;
-}
-
-#fr11 {
-  visibility: hidden;
-  animation: 3s show infinite;
-  animation-delay: 0.6s;
-}
-
-#fr12 {
-  visibility: hidden;
-  animation: 3s show infinite;
-  animation-delay: 0.65s;
-}
-
-#fr13 {
-  visibility: hidden;
-  animation: 3s show infinite;
-  animation-delay: 0.7s;
-}
-
-#fr14 {
-  visibility: hidden;
-  animation: 3s show infinite;
-  animation-delay: 0.75s;
-}
-
-#fr15 {
-  visibility: hidden;
-  animation: 3s show infinite;
-  animation-delay: 0.8s;
-}
-
-#fr16 {
-  visibility: hidden;
-  animation: 3s show infinite;
-  animation-delay: 0.85s;
-}
-
-#fr17 {
-  visibility: hidden;
-  animation: 3s show infinite;
-  animation-delay: 0.9s;
-}
-
-#fr18 {
-  visibility: hidden;
-  animation: 3s show infinite;
-  animation-delay: 0.95s;
-}
-
-#fr19 {
-  visibility: hidden;
-  animation: 3s show infinite;
-  animation-delay: 1s;
-}
-
-#fr20 {
-  visibility: hidden;
-  animation: 3s show infinite;
-  animation-delay: 1.05s;
-}
-
-#fr21 {
-  visibility: hidden;
-  animation: 3s show infinite;
-  animation-delay: 1.1s;
-}
-
-#fr22 {
-  visibility: hidden;
-  animation: 3s show infinite;
-  animation-delay: 1.15s;
-}
-
-#fr23 {
-  visibility: hidden;
-  animation: 3s show infinite;
-  animation-delay: 1.2s;
-}
-
-#fr24 {
-  visibility: hidden;
-  animation: 3s show infinite;
-  animation-delay: 1.25s;
-}
-
-#fr25 {
-  visibility: hidden;
-  animation: 3s show infinite;
-  animation-delay: 1.3s;
-}
-
-#fr26 {
-  visibility: hidden;
-  animation: 3s show infinite;
-  animation-delay: 1.35s;
-}
-
-#fr27 {
-  visibility: hidden;
-  animation: 3s show infinite;
-  animation-delay: 1.4s;
-}
-
-#fr28 {
-  visibility: hidden;
-  animation: 3s show infinite;
-  animation-delay: 1.45s;
-}
-
-#fr29 {
-  visibility: hidden;
-  animation: 3s show infinite;
-  animation-delay: 1.5s;
-}
-
-#fr30 {
-  visibility: hidden;
-  animation: 3s show infinite;
-  animation-delay: 1.55s;
-}
-
-#fr31 {
-  visibility: hidden;
-  animation: 3s show infinite;
-  animation-delay: 1.6s;
-}
-
-#fr32 {
-  visibility: hidden;
-  animation: 3s show infinite;
-  animation-delay: 1.65s;
-}
-
-#fr33 {
-  visibility: hidden;
-  animation: 3s show infinite;
-  animation-delay: 1.7s;
-}
-
-#fr34 {
-  visibility: hidden;
-  animation: 3s show infinite;
-  animation-delay: 1.75s;
-}
-
-#fr35 {
-  visibility: hidden;
-  animation: 3s show infinite;
-  animation-delay: 1.8s;
-}
-
-#fr36 {
-  visibility: hidden;
-  animation: 3s show infinite;
-  animation-delay: 1.85s;
-}
-
-#fr37 {
-  visibility: hidden;
-  animation: 3s show infinite;
-  animation-delay: 1.9s;
-}
-
-#fr38 {
-  visibility: hidden;
-  animation: 3s show infinite;
-  animation-delay: 1.95s;
-}
-
-#fr39 {
-  visibility: hidden;
-  animation: 3s show infinite;
-  animation-delay: 2s;
-}
-
-#fr40 {
-  visibility: hidden;
-  animation: 3s show infinite;
-  animation-delay: 2.05s;
-}
-
-#fr41 {
-  visibility: hidden;
-  animation: 3s show infinite;
-  animation-delay: 2.1s;
-}
-
-#fr42 {
-  visibility: hidden;
-  animation: 3s show infinite;
-  animation-delay: 2.15s;
-}
-
-#fr43 {
-  visibility: hidden;
-  animation: 3s show infinite;
-  animation-delay: 2.2s;
-}
-
-#fr44 {
-  visibility: hidden;
-  animation: 3s show infinite;
-  animation-delay: 2.25s;
-}
-
-#fr45 {
-  visibility: hidden;
-  animation: 3s show infinite;
-  animation-delay: 2.3s;
-}
-
-#fr46 {
-  visibility: hidden;
-  animation: 3s show infinite;
-  animation-delay: 2.35s;
-}
-
-#fr47 {
-  visibility: hidden;
-  animation: 3s show infinite;
-  animation-delay: 2.4s;
-}
-
-#fr48 {
-  visibility: hidden;
-  animation: 3s show infinite;
-  animation-delay: 2.45s;
-}
-
-#fr49 {
-  visibility: hidden;
-  animation: 3s show infinite;
-  animation-delay: 2.5s;
-}
-
-#fr50 {
-  visibility: hidden;
-  animation: 3s show infinite;
-  animation-delay: 2.55s;
-}
-
-#fr51 {
-  visibility: hidden;
-  animation: 3s show infinite;
-  animation-delay: 2.6s;
-}
-
-#fr52 {
-  visibility: hidden;
-  animation: 3s show infinite;
-  animation-delay: 2.65s;
-}
-
-#fr53 {
-  visibility: hidden;
-  animation: 3s show infinite;
-  animation-delay: 2.7s;
-}
-
-#fr54 {
-  visibility: hidden;
-  animation: 3s show infinite;
-  animation-delay: 2.75s;
-}
-
-#fr55 {
-  visibility: hidden;
-  animation: 3s show infinite;
-  animation-delay: 2.8s;
-}
-
-#fr56 {
-  visibility: hidden;
-  animation: 3s show infinite;
-  animation-delay: 2.85s;
-}
-
-#fr57 {
-  visibility: hidden;
-  animation: 3s show infinite;
-  animation-delay: 2.9s;
-}
-
-#fr58 {
-  visibility: hidden;
-  animation: 3s show infinite;
-  animation-delay: 2.95s;
-}
-
-#fr59 {
-  visibility: hidden;
-  animation: 3s show infinite;
-  animation-delay: 3s;
-}
-
-@keyframes show {
-  0% { visibility: visible;}
-  1.666% { visibility: visible; }
-  1.667% { visibility: hidden; }
-  100% { visibility: hidden; }
+#updating-msg {
+  position: absolute;
+  top: 29px;
+  left: 68px;
+  font-size: 13px;
 }
 
+#updating-icon {
+  position: absolute;
+  top: 26px;
+  left: 7px;
+  width: 60px;
+  height: 60px;
+}

package/static/scripts/linny-r-ctrl.js

@@ -302,14 +302,20 @@ class Controller {
         (name.startsWith(this.BLACK_BOX) || name[0].match(/[\w]/));
   }
   
-  prefixesAndName(name) {
+  prefixesAndName(name, key=false) {
     // Returns name split exclusively at '[non-space]: [non-space]'
+    let sep = this.PREFIXER,
+        space = ' ';
+    if(key) {
+      sep = ':_';
+      space = '_';
+    }
     const
-        s = name.split(this.PREFIXER),
+        s = name.split(sep),
         pan = [s[0]];
     for(let i = 1; i < s.length; i++) {
       const j = pan.length - 1;
-      if(s[i].startsWith(' ') || (i > 0 && pan[j].endsWith(' '))) {
+      if(s[i].startsWith(space) || (i > 0 && pan[j].endsWith(space))) {
         pan[j] += s[i];
       } else {
         pan.push(s[i]);
@@ -350,14 +356,20 @@ class Controller {
             this.LINK_ARROW : this.CONSTRAINT_ARROW),
         nodes = name.split(arrow);
     for(let i = 0; i < nodes.length; i++) {
-      nodes[i] = nodes[i].replace(/^:\s*/, prefix);
+      nodes[i] = nodes[i].replace(/^:\s*/, prefix)
+          // NOTE: An embedded double prefix, e.g., "xxx: : yyy" indicates
+          // that the second colon+space should be replaced by the prefix.
+          // This "double prefix" may occur only once in an entity name,
+          // hence no global regexp.
+          .replace(/(\w+):\s+:\s+(\w+)/, `$1: ${prefix}$2`);
     }
     return nodes.join(arrow);
   }
   
   tailNumber(name) {
     // Returns the string of digits at the end of `name`. If not there,
-    // check prefixes (if any) from right to left for a tail number.
+    // check prefixes (if any) *from right to left* for a tail number.
+    // Thus, the number that is "closest" to the name part is returned.
     const pan = UI.prefixesAndName(name);
     let n = endsWithDigits(pan.pop());
     while(!n && pan.length > 0) {
@@ -366,6 +378,48 @@ class Controller {
     return n;
   }
   
+  compareFullNames(n1, n2, key=false) {
+    // Compare full names, considering prefixes in *left-to-right* order
+    // while taking into account the tailnumber for each part so that
+    // "xx: yy2: nnn" comes before "xx: yy10: nnn".
+    if(n1 === n2) return 0;
+    if(key) {
+      // NOTE: Replacing link and constraint arrows by two prefixers
+      // ensures that sort wil be first on FROM node, and then on TO node.
+      const p2 = UI.PREFIXER + UI.PREFIXER;
+      // Keys for links and constraints are not based on their names,
+      // so look up their names before comparing.
+      if(n1.indexOf('____') > 0 && MODEL.constraints[n1]) {
+        n1 = MODEL.constraints[n1].displayName
+            .replace(UI.CONSTRAINT_ARROW, p2);
+      } else if(n1.indexOf('___') > 0 && MODEL.links[n1]) {
+        n1 = MODEL.links[n1].displayName
+            .replace(UI.LINK_ARROW, p2);
+      }
+      if(n2.indexOf('____') > 0 && MODEL.constraints[n2]) {
+        n2 = MODEL.constraints[n2].displayName.
+            replace(UI.CONSTRAINT_ARROW, p2);
+      } else if(n2.indexOf('___') > 0 && MODEL.links[n2]) {
+        n2 = MODEL.links[n2].displayName
+            .replace(UI.LINK_ARROW, p2);
+      }
+      n1 = n1.toLowerCase().replaceAll(' ', '_');
+      n2 = n2.toLowerCase().replaceAll(' ', '_');
+    }
+    const
+        pan1 = UI.prefixesAndName(n1, key),
+        pan2 = UI.prefixesAndName(n2, key),
+        sl = Math.min(pan1.length, pan2.length);
+    let i = 0;
+    while(i < sl) {
+      const c = compareWithTailNumbers(pan1[i], pan2[i]);
+      if(c !== 0) return c;
+      i++;
+    }
+    return pan1.length - pan2.length;
+  }
+
+  
   nameToID(name) {
     // Returns a name in lower case with link arrow replaced by three
     // underscores, constraint link arrow by four underscores, and spaces