Mercurial > hg > webaudioevaluationtool

changeset 2876:88dff8b9247c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
#75
author Nicholas Jillings <nicholas.jillings@mail.bcu.ac.uk>
date Wed, 31 May 2017 11:52:26 +0100
parents 18261c4593c4
children 5164a6f53a02
files test_create.html test_create/test_core.js
diffstat 2 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/test_create.html	Wed May 31 11:43:48 2017 +0100
+++ b/test_create.html	Wed May 31 11:52:26 2017 +0100
@@ -859,11 +859,11 @@
                     <button type="button" class="btn btn-danger" ng-click="clearScales()" ng-show="interface.scales.length > 0">Clear Scales</button>
                     <div class="dropdown" style="display: inline-block;">
                         <button class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
-                            Use scale...
+                            {{selectedScale}}
                             <span class="caret"></span>
                         </button>
                         <ul class="dropdown-menu" aria-labelledby="dropdownMenu1">
-                            <li ng-repeat="scale in testSpecifications.scales" ng-click="useScales(scale.scales)"><a href="#">{{scale.name}}</a></li>
+                            <li ng-repeat="scale in testSpecifications.scales" ng-click="useScales(scale)"><a href="#">{{scale.name}}</a></li>
                         </ul>
                     </div>
                     <div class="node" ng-repeat="scale in interface.scales">
--- a/test_create/test_core.js	Wed May 31 11:43:48 2017 +0100
+++ b/test_create/test_core.js	Wed May 31 11:52:26 2017 +0100
@@ -298,12 +298,14 @@
     $s.clearScales = function () {
         $s.interface.scales = [];
     };
-    $s.useScales = function (scales) {
+    $s.useScales = function (scale) {
         $s.clearScales();
-        scales.forEach(function (s) {
+        scale.scales.forEach(function (s) {
             $s.interface.scales.push(s);
         });
+        $s.selectedScale = "Scale: " + scale.name
     };
+    $s.selectedScale = "Scale: Custom";
 }]);
 AngularInterface.controller("page", ['$scope', '$element', '$window', function ($s, $e, $w) {
     $s.addInterface = function () {