Changeset 18780 for lang/ruby

Timestamp:

09/04/08 02:50:25 (3 months ago)

Author:

hajimehoshi

Message:

Refactored

Files:

• lang/ruby/bokeshi/trunk/website/public/javascripts/bokeshi.js (modified) (4 diffs)

lang/ruby/bokeshi/trunk/website/public/javascripts/bokeshi.js

@@ -2 +2 @@
 
 function initStage() {
-    var stageHTML = $("#stage");
     for (var i = 0; i < stage.length; i++) {
         var ul = $('<ul></ul>').addClass("row");
         for (var j = 0; j < stage[i].length; j++) {
-            ul.append($("<li>|</li>").attr("id", "stick_"+i+"_"+j).data("row", i).data("col", j));
+            ul.append($("<li>|</li>").data("row", i).data("col", j));
         }
-        stageHTML.append(ul);
+        $("#stage").append(ul);
     }
     $(".row").selectable({
@@ -17 +16 @@
             var selected = $.grep($(".ui-selected"), function (e, i) {
                 return !$(e).hasClass("removed");
+            }).sort(function (a, b) {
+                return $(a).data("col") - $(b).data("col");
             });
             if (0 < selected.length) {
-                var firstCol = $(selected[0]).data("col")
+                var firstRow = $(selected[0]).data("row");
+                var firstCol = $(selected[0]).data("col");
                 var isSuccessive = true
                 for (var i = 1; i < selected.length; i++) {
@@ -29 +31 @@
                 if (isSuccessive) {
                     stage.remove({
-                        row: $(selected[0]).data("row"),
-                        col: $(selected[0]).data("col"),
+                        row: firstRow,
+                        col: firstCol,
                         length: selected.length
                     }, "player");
@@ -59 +61 @@
             var col = removing.col;
             var length = removing.length;
-            for (var i = 0; i < length; i++) {
-                var col2 = col + i;
-                this[row][col2] = by;
-                var id = "stick_" + row + "_" + col2;
-                $("#" + id).addClass("removed").addClass({
+            var stick = $("#stage li").filter(function () {
+                return $(this).data("row") == row && $(this).data("col") == col;
+            });
+            for (var i = 0; i < length; i++, stick = stick.next()) {
+                this[row][col + i] = by;
+                stick.addClass("removed").addClass({
                     "player": "byPlayer",
                     "cpu": "byCPU"