Merge branch 'emscripten' into about_help_option

emscripten/project/purr-data/components/menu/menu.html

@@ -36,8 +36,6 @@
             <!-- View Section -->
             <li id="menu-view">
                 <ul class="rounded shadow">
-                    <li id="view-zoomout"></li>
-                    <li id="view-zoomreset"></li>
                     <li id="view-fullscreen"></li>
                 </ul>
             </li>

emscripten/project/purr-data/components/menu/menu.js

@@ -110,19 +110,6 @@ function menu_options(type, w, cid) {
         },
 
         // View entries
-        "view-zoomout": {
-            label: l("menu.zoomout"),
-            key: pdbundle.shortcuts.menu.zoomout_web.key,
-            modifiers: pdbundle.shortcuts.menu.zoomout_web.modifiers,
-            tooltip: l("menu.zoomout_tt")
-        },
-        "view-zoomreset": {
-            label: l("menu.zoomreset"),
-            key: pdbundle.shortcuts.menu.zoomreset_web.key,
-            modifiers: pdbundle.shortcuts.menu.zoomreset_web.modifiers,
-            tooltip: l("menu.zoomreset_tt"),
-            top_hr: {}
-        },
         "view-fullscreen": {
             label: l("menu.fullscreen"),
             key: pdbundle.shortcuts.menu.fullscreen_web.key,
@@ -430,12 +417,25 @@ function menu_options(type, w, cid) {
         },
 
         // View section
+        "view-zoomreset": {
+            label: l("menu.zoomreset"),
+            key: pdbundle.shortcuts.menu.zoomreset_web.key,
+            modifiers: pdbundle.shortcuts.menu.zoomreset_web.modifiers,
+            tooltip: l("menu.zoomreset_tt"),
+            top_hr: {}
+        },
         "view-zoomin": {
             label: l("menu.zoomin"),
             key: pdbundle.shortcuts.menu.zoomin_web.key,
             modifiers: pdbundle.shortcuts.menu.zoomin_web.modifiers,
             tooltip: l("menu.zoomin_tt")
         },
+        "view-zoomout": {
+            label: l("menu.zoomout"),
+            key: pdbundle.shortcuts.menu.zoomout_web.key,
+            modifiers: pdbundle.shortcuts.menu.zoomout_web.modifiers,
+            tooltip: l("menu.zoomout_tt")
+        },
         ...view_base,
 
         // View entries

emscripten/project/purr-data/utils/actions.js

@@ -182,8 +182,9 @@ function add_shortcuts(cid){
         shortcut += e.key.toUpperCase();
         if(window.shortkeys[cid].hasOwnProperty(shortcut)){
             switch(shortcut) {
+                case "Ctrl+0":
                 case "Ctrl+=":
-                    break;
+                case "Ctrl+-":
                 case "F11":
                     break;
                 default:

pd/nw/css/c64.css

@@ -274,8 +274,7 @@ text {
 .comment .border {
     fill: none;
 }
-
-#patchsvg.editmode .comment .border {
+svg[id^="patchsvg"].editmode .comment .border {
     stroke: #7569d7;
     stroke-dasharray: 8 4;
 }

pd/nw/css/default.css

@@ -385,7 +385,7 @@ text {
     fill: none;
 }
 
-#patchsvg.editmode .comment .border {
+svg[id^="patchsvg"].editmode .comment .border {
     stroke: #aaa;
     stroke-dasharray: 3 2;
 }

pd/nw/css/extended.css

@@ -265,7 +265,7 @@ text {
     fill: none;
 }
 
-#patchsvg.editmode .comment .border {
+svg[id^="patchsvg"].editmode .comment .border {
     stroke: #aaa;
     stroke-dasharray: 8 4;
 }

pd/nw/css/footgun.css

@@ -391,7 +391,7 @@ text {
     fill: none;
 }
 
-#patchsvg.editmode .comment .border {
+svg[id^="patchsvg"].editmode .comment .border {
     stroke: #aaa;
     stroke-dasharray: 8 4;
 }

pd/nw/css/inverted.css

@@ -287,7 +287,7 @@ text {
     fill: none;
 }
 
-#patchsvg.editmode .comment .border {
+svg[id^="patchsvg"].editmode .comment .border {
     stroke: #5f5f5f;
     stroke-dasharray: 8 4;
 }

pd/nw/css/solarized.css

@@ -282,7 +282,7 @@ text {
     fill: none;
 }
 
-#patchsvg.editmode .comment .border {
+svg[id^="patchsvg"].editmode .comment .border {
     stroke: #94b2b2;
     stroke-dasharray: 8 4;
 }

pd/nw/css/solarized_inverted.css

@@ -282,7 +282,7 @@ text {
     fill: none;
 }
 
-#patchsvg.editmode .comment .border {
+svg[id^="patchsvg"].editmode .comment .border {
     stroke: #475d64;
     stroke-dasharray: 8 4;
 }

pd/nw/css/strongbad.css

@@ -278,7 +278,7 @@ text {
     fill: none;
 }
 
-#patchsvg.editmode .comment .border {
+svg[id^="patchsvg"].editmode .comment .border {
     stroke: #0b560b;
     stroke-dasharray: 8 4;
 }

pd/nw/css/subdued.css

@@ -272,7 +272,7 @@ text {
     fill: none;
 }
 
-#patchsvg.editmode .comment .border {
+svg[id^="patchsvg"].editmode .comment .border {
     stroke: #777;
     stroke-dasharray: 8 4;
 }

pd/nw/css/vanilla.css

@@ -265,7 +265,7 @@ text {
     fill: none;
 }
 
-#patchsvg.editmode .comment .border {
+svg[id^="patchsvg"].editmode .comment .border {
     stroke: black;
     stroke-dasharray: 8 4;
 }

pd/nw/css/vanilla_inverted.css

@@ -282,7 +282,7 @@ text {
     fill: none;
 }
 
-#patchsvg.editmode .comment .border {
+svg[id^="patchsvg"].editmode .comment .border {
     stroke: white;
     stroke-dasharray: 8 4;
 }