首頁 探索 說明
登入
azra
/
angularjs-bootcamp-app
镜像来自 https://gitlab.com/azrazalea/angularjs-bootcamp-app
關註 1
讚好 0
複刻 0
代碼 問題管理 0 提交歷史 38 版本發佈 0 Wiki
瀏覽代碼

Add random.org resolve

Lily Carpenter 10 年之前
父節點
11b6ac2a02
當前提交
92725d98ed
共有 5 個文件被更改，包括 11 次插入 和 5 次删除
統一視圖 顯示文件統計
  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
查看文件

12 
     "bootstrap": "~3.3.0",
 12 
     "bootstrap": "~3.3.0",
13 
     "angular": "~1.3.2",
 13 
     "angular": "~1.3.2",
14 
     "angular-mocks": "~1.3.2",
 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
查看文件

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

+ 1 - 0
www/js/controllers/randomCtrl.js
查看文件

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

+ 6 - 3
www/js/services/stupid.js
查看文件

10 
         params: {
 10 
         params: {
11 
           num: 9,
 11 
           num: 9,
12 
           min: 1,
 12 
           min: 1,
13 
-          max: 50000,
13 
+          max: 5000,
14 
           col: 1,
 14 
           col: 1,
15 
           base: 10,
 15 
           base: 10,
16 
           format: 'plain',
 16 
           format: 'plain',
17 
           rnd: 'new'
 17 
           rnd: 'new'
18 
         }
 18 
         }
19 
       }).then(function(response){
 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 
     function startNumberGeneration(numbers_to_find){
 26 
     function startNumberGeneration(numbers_to_find){
27 
+      numbers_to_find = numbers_to_find.value();
25 
       var deferred = $q.defer();
 28 
       var deferred = $q.defer();
26 
       var p = deferred.promise;
 29 
       var p = deferred.promise;
27
30
28 
       $rootScope.$evalAsync(function(){
 31 
       $rootScope.$evalAsync(function(){
29 
         var min = 1,
 32 
         var min = 1,
30 
-            max = 50000;
33 
+            max = 5000;
31 
         var newNumber = null;
 34 
         var newNumber = null;
32 
         var found_numbers = [];
 35 
         var found_numbers = [];
33 
         var number_index = 0;
 36 
         var number_index = 0;

+ 1 - 1
www/partials/random.html
查看文件

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