Changeset 18776

Timestamp:

09/04/08 01:27:29 (4 months ago)

Author:

hajimehoshi

Message:

Updated js

Files:

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

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

@@ -5 +5 @@
     for (var i = 0; i < stage.length; i++) {
         var row = stage[i];
-        var ul = $('<ul class="row"></ul>');
+        var ul = $('<ul></ul>').addClass("row");
         for (var j = 0; j < row.length; j++) {
             var id = "stick_" + i + "_" + j;
-            var li = $("<li id=\"" + id + "\">|</li>");
+            var li = $("<li>|</li>").attr("id", id);
             li.data("row", i).data("col", j);
             if (j < row.length - 1) {
@@ -22 +22 @@
         },
         stop: function () {
-            var selectedAll = $(".ui-selected");
-            var previousState = $(selectedAll[0]).hasClass("removed");
-            var stateChangedCount = 0;
-            if (previousState) {
-                stateChangedCount = -1
-            }
-            for (var i = 1; i < selectedAll.length; i++) {
-                var currentState = $(selectedAll[i]).hasClass("removed");
-                if (currentState != previousState) {
-                    previousState = currentState;
-                    stateChangedCount++;
-                    if (2 <= stateChangedCount) {
+            var selected = $.grep($(".ui-selected"), function (e, i) {
+                return !$(e).hasClass("removed");
+            });
+            if (0 < selected.length) {
+                var firstCol = $(selected[0]).data("col")
+                var isSuccessive = true
+                for (var i = 1; i < selected.length; i++) {
+                    if ($(selected[i]).data("col") != firstCol + i) {
+                        isSuccessive = false;
                         break;
                     }
                 }
-            }
-            if (stateChangedCount < 2) {
-                var selected = $.grep(selectedAll, function (e, i) {
-                    return !$(e).hasClass("removed");
-                });
-                if (0 < selected.length) {
+                if (isSuccessive) {
                     stage.remove({
                         row: $(selected[0]).data("row"),