fix #429, wholenumber is now has render.edit, also change order of bu…

…ilding CSS, so style CSS overrides toolkit CSS when needed (#385, #379)
shamansir · Feb 15, 2017 · 8f7704a · 8f7704a
1 parent 582efce
commit 8f7704a
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 16 deletions.
diff --git a/gulpfile.js b/gulpfile.js
@@ -642,24 +642,24 @@ function getCssFiles(options) {
     options.renderer.forEach(function(renderer) {
         list.push(Paths.Renderer(renderer) + '.css');
     });
-    options.style.forEach(function(style) {
+    options.toolkit.forEach(function(toolkit) {
         options.renderer.forEach(function(renderer) {
-            list.push(Paths.StyleRenderer(style, renderer) + '.css');
+            list.push(Paths.ToolkitRenderer(toolkit, renderer) + '.css');
         });
     });
-    options['user-style'].forEach(function(style) {
+    options['user-toolkit'].forEach(function(toolkit) {
         options.renderer.forEach(function(renderer) {
-            list.push(Paths.UserStyleRenderer(style, renderer) + '.css');
+            list.push(Paths.UserToolkitRenderer(toolkit, renderer) + '.css');
         });
     });
-    options.toolkit.forEach(function(toolkit) {
+    options.style.forEach(function(style) {
         options.renderer.forEach(function(renderer) {
-            list.push(Paths.ToolkitRenderer(toolkit, renderer) + '.css');
+            list.push(Paths.StyleRenderer(style, renderer) + '.css');
         });
     });
-    options['user-toolkit'].forEach(function(toolkit) {
+    options['user-style'].forEach(function(style) {
         options.renderer.forEach(function(renderer) {
-            list.push(Paths.UserToolkitRenderer(toolkit, renderer) + '.css');
+            list.push(Paths.UserStyleRenderer(style, renderer) + '.css');
         });
     });
     return list;

diff --git a/src/style/ableton-out/svg.css b/src/style/ableton-out/svg.css
@@ -27,11 +27,6 @@
     display: none;
 }
 
-.rpd-inlet.rpd-util-number foreignobject, .rpd-outlet.rpd-util-number foreignobject {
-    transform: translate(-43px,1px);
-    font-size: 8px;
-}
-
 .rpd-inlet text.rpd-name,
 .rpd-outlet text.rpd-name {
     font-size: 9px;
@@ -163,6 +158,13 @@
 }
 
 .rpd-inlet.rpd-util-number foreignobject,
-.rpd-outlet.rpd-util-number foreignobject {
+.rpd-inlet.rpd-util-wholenumber foreignobject {
     transform: translate(-43px,1px);
 }
+
+.rpd-inlet.rpd-util-number foreignobject,
+.rpd-outlet.rpd-util-number foreignobject,
+.rpd-inlet.rpd-util-wholenumber foreignobject,
+.rpd-outlet.rpd-util-wholenumber foreignobject {
+    font-size: 8px;
+}
diff --git a/src/toolkit/util/html.js b/src/toolkit/util/html.js
@@ -36,6 +36,8 @@ Rpd.channelrenderer('util/number', 'html', {
     }
 });
 
+Rpd.channelrenderer('util/wholenumber', 'html', Rpd.allChannelRenderers['util/number']['html']);
+
 Rpd.noderenderer('util/number', 'html', {
     first: function(bodyElm) {
         var valInput = document.createElement('input');

diff --git a/src/toolkit/util/svg.css b/src/toolkit/util/svg.css
@@ -7,14 +7,14 @@
 }
 
 .rpd-inlet.rpd-util-number foreignobject,
-.rpd-outlet.rpd-util-number foreignobject {
+.rpd-inlet.rpd-util-wholenumber foreignobject {
     transform: translate(-2px,-8px);
     /* text-align: end; */
     /* text-anchor: end; */
 }
 
 .rpd-inlet.rpd-util-number input[type=number],
-.rpd-outlet.rpd-util-number input[type=number] {
+.rpd-inlet.rpd-util-wholenumber input[type=number] {
     border: 1px solid lightgray;
     background-color: #eee;
     font-size: 0.8em;

diff --git a/src/toolkit/util/svg.js b/src/toolkit/util/svg.js
@@ -41,6 +41,10 @@ Rpd.channelrenderer('util/number', 'svg', {
     }
 });
 
+/* ========================= util/wholenumber ========================= */
+
+Rpd.channelrenderer('util/wholenumber', 'svg', Rpd.allChannelRenderers['util/number']['svg']);
+
 /* ========================= util/random ========================= */
 
 Rpd.noderenderer('util/random', 'svg', function() {