Browse Source

fix most bugs

Maxim Sokhatsky 11 years ago
parent
commit
3469b25624

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

@@ -19,11 +19,11 @@
     <script src="js/timer.js"></script>
     <script src="js/player.js"></script>
 
-    <script src="js/okey/apiprovider.js"></script>
+    <script src="js/okey/okey_protocol.js"></script>
     <script src="js/okey/hand.js"></script>
     <script src="js/okey/card.js"></script>
     <script src="js/okey/deck.js"></script>
-    <script src="js/okey/app.js"></script>
+    <script src="js/okey/okey.js"></script>
 
     <script src="js/chat.js"></script>
     <script src="js/bootloader.js"></script>

+ 1 - 1
apps/web/priv/static/app/js/okey/deck.js

@@ -53,7 +53,7 @@ function DeckScope(scope) {
         render: function() {
             this.each(function(card, i, j) {
                 if (null != card) {
-                    card.$el.attr("transform", "translate(" + this.trfs[j][i].x + "," + this.trfs[j][i].y + ")");
+                    card.$el.attr("transform", "translate(" + this.trfs[j][i].x + " " + this.trfs[j][i].y + ")");
 //                    console.log(card.$el[0]);
                     card.drag();
                     this.$el.append(card.$el[0]);

+ 2 - 2
apps/web/priv/static/app/js/okey/app.js → apps/web/priv/static/app/js/okey/okey.js

@@ -1,5 +1,5 @@
 
-function StartApp()      { $.load(scope.CARD_SOURCE, PostLoad); }
+function StartApp() { $.load(scope.CARD_SOURCE, PostLoad); }
 
 function PostLoad()
 {
@@ -19,7 +19,7 @@ function PostLoad()
 
     function createCentralCard() {
         centralCard = new scope.Card(),
-        centralCard.$el.attr({opacity: 0, transform: "translate(298, -115)" })
+        centralCard.$el.attr({opacity: 0, transform: "translate(298 -115)" })
         .on(document.createTouch ? "touchstart" : "mousedown", fadeIn)
         .on(document.createTouch ? "touchend"   : "mouseup",   fadeOut);
 

+ 0 - 0
apps/web/priv/static/app/js/okey/apiprovider.js → apps/web/priv/static/app/js/okey/okey_protocol.js


+ 4 - 0
apps/web/priv/static/app/js/tavla/tavla.js

@@ -0,0 +1,4 @@
+
+function StartApp() { $.load(scope.CARD_SOURCE, PostLoad); }
+
+