홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Bri Prebilic Cole
b07c279b 1 parent 66f9e6e1

GUI -- show-icons.html test file is successfully linked with its module and controller 

Change-Id: I4d76994949b8cbf834d355e529be4d1a29d31462
Inline Side-by-side
Showing 2 changed files with 14 additions and 7 deletions
...@@ -33,4 +33,4 @@ ...@@ -33,4 +33,4 @@
33 33
34 $log.log('OvShowIconsTest has been created'); 34 $log.log('OvShowIconsTest has been created');
35 }]); 35 }]);
36 -})(); 36 +}());
......
...@@ -24,12 +24,19 @@ ...@@ -24,12 +24,19 @@
24 <meta charset="UTF-8"> 24 <meta charset="UTF-8">
25 <title>Show Icons Angular</title> 25 <title>Show Icons Angular</title>
26 26
27 - <script src="show-icons-test.js"></script> 27 + <script type="text/javascript" src="../tp/angular.js"></script>
28 + <script type="text/javascript" src="../tp/angular-route.js"></script>
28 29
29 - <script src="../tp/angular.js"></script> 30 + <script type="text/javascript" src="../tp/d3.js"></script>
30 - <script src="../tp/angular-route.js"></script>
31 31
32 - <script src="../tp/d3.js"></script> 32 + <script type="text/javascript" src="../app/fw/util/util.js"></script>
33 + <script type="text/javascript" src="../app/fw/util/fn.js"></script>
34 + <script type="text/javascript" src="../app/fw/util/theme.js"></script>
35 + <script type="text/javascript" src="../app/fw/util/keys.js"></script>
36 + <script type="text/javascript" src="../app/fw/svg/svg.js"></script>
37 + <script type="text/javascript" src="../app/fw/svg/glyph.js"></script>
38 + <script type="text/javascript" src="../app/fw/svg/icon.js"></script>
39 + <script type="text/javascript" src="show-icons-test.js"></script>
33 40
34 <link rel="stylesheet" href="../app/common.css"> 41 <link rel="stylesheet" href="../app/common.css">
35 42
...@@ -51,8 +58,8 @@ ...@@ -51,8 +58,8 @@
51 <body class="light" ng-app="showIconsTest"> 58 <body class="light" ng-app="showIconsTest">
52 <h2>Showing Icons with Icon Service Angular</h2> 59 <h2>Showing Icons with Icon Service Angular</h2>
53 <div id="show-icons" ng-controller="OvShowIconsTest as ctrl"> 60 <div id="show-icons" ng-controller="OvShowIconsTest as ctrl">
54 - {{ctrl.message}} 61 + <!--{{message}}-->
55 - <!--{{a}} + {{b}} = {{a+b}}--> 62 + <p>{{ctrl.a}} + {{ctrl.b}} = {{ctrl.a+ctrl.b}}</p>
56 </div> 63 </div>
57 64
58 65
......