Merge remote-tracking branch 'refs/remotes/origin/dev' into gh-pages

lautr3k · 6cf10ccab30079e1db120a7565e0b3fb4ed4af4f · lautr3k committed Aug 6, 2016 · Aug 6, 2016 · 6cf10cc
2 parents af800b7 + f8f01d3
commit 6cf10ccab30079e1db120a7565e0b3fb4ed4af4f
Unified Split

Showing with 4 additions and 2 deletions.

+1 −1 index.html

+3 −1 js/main.js
diff --git a/index.html b/index.html
@@ -57,7 +57,7 @@
                         <h3 class="panel-title">Transformations</h3>
                     </div>
                     <div id="transform-body" class="panel-body collapse in">
-                        <div class="form-group">
+                        <div class="form-group" id="transform-mirror">
                             <label for="transform-mirror">Mirror</label>
                             <input type="radio" name="transform-mirror" id="transform-mirror-yes" value="yes" /> yes
                             <input type="radio" name="transform-mirror" id="transform-mirror-no" value="no" checked="checked" /> no
diff --git a/js/main.js b/js/main.js
@@ -871,13 +871,15 @@ function updateTransformAction() {
 
 function updateTransformValues() {
     var current = transformations[transformAction];
-    var uniform = $('#transform input[type=radio]:checked').val() == 'yes';
+    var uniform = $('#transform-uniform input[type=radio]:checked').val() == 'yes';
     var input   = {
         x: parseFloat($transformX.val()),
         y: parseFloat($transformY.val()),
         z: parseFloat($transformZ.val())
     };
 
+    console.log(uniform)
+
     input.x = isNaN(input.x) ? current.x : input.x;
     input.y = isNaN(input.y) ? current.y : input.y;
     input.z = isNaN(input.z) ? current.z : input.z;