Home Esplora Aiuto
Accedi
azra
/
angularjs-bootcamp-app
mirror da https://gitlab.com/azrazalea/angularjs-bootcamp-app
Segui 1
Vota 0
Forka 0
Codice Problemi 0 Commit 38 Rilasci 0 Wiki
Sfoglia il codice sorgente

Add random.org resolve

Lily Carpenter 10 anni fa
parent
11b6ac2a02
commit
92725d98ed
5 ha cambiato i file con 11 aggiunte e 5 eliminazioni
Visualizzazione separata Mostra Diff Stats
  1. 2 1
      bower.json
  2. 1 0
      www/index.html
  3. 1 0
      www/js/controllers/randomCtrl.js
  4. 6 3
      www/js/services/stupid.js
  5. 1 1
      www/partials/random.html

+ 2 - 1
bower.json
Vedi File 

@@ -12,6 +12,7 @@
12 12 
     "bootstrap": "~3.3.0",
13 13 
     "angular": "~1.3.2",
14 14 
     "angular-mocks": "~1.3.2",
15 
-    "angular-route": "~1.3.2"
15 
+    "angular-route": "~1.3.2",
16 
+    "lodash": "~2.4.1"
16 17 
   }
17 18 
 }

+ 1 - 0
www/index.html
Vedi File 

@@ -6,6 +6,7 @@
6 6 
   <body>
7 7 
     <div ng-view>
8 8 
     </div>
9 
+    <script src="lib/lodash/dist/lodash.js"></script>
9 10 
     <script src="lib/angular/angular.js"></script>
10 11 
     <script src="lib/angular-route/angular-route.js"></script>
11 12 
     <script src="js/app.js"></script>

+ 1 - 0
www/js/controllers/randomCtrl.js
Vedi File 

@@ -22,5 +22,6 @@ angular.module('bootcampApp')
22 22 
     $q.all([promiseOne, promiseTwo, promiseThree]).then(function(data){
23 23 
       console.log("All numbers found");
24 24 
       console.log(data);
25 
+      $scope.message = data;
25 26 
     });
26 27 
   });

+ 6 - 3
www/js/services/stupid.js
Vedi File 

@@ -10,24 +10,27 @@ angular.module('bootcampApp')
10 10 
         params: {
11 11 
           num: 9,
12 12 
           min: 1,
13 
-          max: 50000,
13 
+          max: 5000,
14 14 
           col: 1,
15 15 
           base: 10,
16 16 
           format: 'plain',
17 17 
           rnd: 'new'
18 18 
         }
19 19 
       }).then(function(response){
20 
-        return response.data.split("\n");
20 
+        return _(response.data.split ("\n")).compact().map(function(element){
21 
+          return parseInt(element, 10);
22 
+        });
21 23 
       });
22 24 
     };
23 25
24 26 
     function startNumberGeneration(numbers_to_find){
27 
+      numbers_to_find = numbers_to_find.value();
25 28 
       var deferred = $q.defer();
26 29 
       var p = deferred.promise;
27 30
28 31 
       $rootScope.$evalAsync(function(){
29 32 
         var min = 1,
30 
-            max = 50000;
33 
+            max = 5000;
31 34 
         var newNumber = null;
32 35 
         var found_numbers = [];
33 36 
         var number_index = 0;

+ 1 - 1
www/partials/random.html
Vedi File 

@@ -1,3 +1,3 @@
1 1 
 <div>
2 
-  {{message}}
2 
+  <pre>{{message | json }}</pre>
3 3 
 </div>