Browse Source

signed constants sent from server as strings

Maxim Sokhatsky 10 years ago
parent
commit
6b40bf8b71

+ 2 - 2
apps/server/src/okey/okey_table.erl

@@ -1358,8 +1358,8 @@ round_results(
         results = Results,
         next_action = next_round}.
 
-js_hack(Score) when Score < 0 -> -Score * 1000000;
-js_hack(Score) -> Score.
+%js_hack(Score) when Score < 0 -> -Score * 1000000;
+js_hack(Score) -> integer_to_binary(Score).
 
 create_okey_series_ended(Results, Players, Confirm,
     #okey_state{tournament_type=GameKind,game_mode=GameMode,speed=Speed,rounds=Rounds}=GameState) ->

+ 17 - 17
apps/web/priv/static/app/index.htm

@@ -13,26 +13,26 @@
 
     <svg id="Refined" style="top:0; left:0; height:100%; width:100%;"></svg>
 
-    <script src="js/n2o/bert.js?v=2"></script>
-    <script src="js/n2o/bullet.js?v=2"></script>
-    <script src="js/n2o/facebook.js?v=2"></script>
+    <script src="js/n2o/bert.js?v=3"></script>
+    <script src="js/n2o/bullet.js?v=3"></script>
+    <script src="js/n2o/facebook.js?v=3"></script>
 
-    <script src="js/selector.js?v=2"></script>
-    <script src="js/controller.js?v=2"></script>
-    <script src="js/dragndrop.js?v=2"></script>
-    <script src="js/timer.js?v=2"></script>
-    <script src="js/player.js?v=2"></script>
-    <script src="js/chat.js?v=2"></script>
-    <script src="js/roster.js?v=2"></script>
-    <script src="js/translations.js?v=2"></script>
+    <script src="js/selector.js?v=3"></script>
+    <script src="js/controller.js?v=3"></script>
+    <script src="js/dragndrop.js?v=3"></script>
+    <script src="js/timer.js?v=3"></script>
+    <script src="js/player.js?v=3"></script>
+    <script src="js/chat.js?v=3"></script>
+    <script src="js/roster.js?v=3"></script>
+    <script src="js/translations.js?v=3"></script>
 
-    <script src="js/okey/okey_protocol.js?v=2"></script>
-    <script src="js/okey/hand.js?v=2"></script>
-    <script src="js/okey/card.js?v=2"></script>
-    <script src="js/okey/deck.js?v=2"></script>
-    <script src="js/okey/okey.js?v=2"></script>
+    <script src="js/okey/okey_protocol.js?v=3"></script>
+    <script src="js/okey/hand.js?v=3"></script>
+    <script src="js/okey/card.js?v=3"></script>
+    <script src="js/okey/deck.js?v=3"></script>
+    <script src="js/okey/okey.js?v=3"></script>
 
-    <script src="js/bootloader.js?v=2"></script>
+    <script src="js/bootloader.js?v=3"></script>
 
 </body>
 </html>

+ 2 - 4
apps/web/priv/static/app/js/bootloader.js

@@ -23,10 +23,8 @@ function statsRow(start_x,start_y,i,games,iter,check) {
 
 function gameresultRow(start_x,start_y,i,results) {
      var name = results[i].value[0][0].value,
-         round = results[i].value[0][2],
-         total = results[i].value[0][3];
-         round = round > 500000 ? -Math.round(round/1000000) : round;
-         total = total > 500000 ? -Math.round(total/1000000) : total;
+         round = results[i].value[0][2].value,
+         total = results[i].value[0][3].value;
     var name = template_engine(
      '<tspan xmlns="http://www.w3.org/2000/svg" x="{this.x}" y="{this.y}">{this.body}</tspan>',{
             x: start_x,