Commit 4d127ebc authored by 神楽坂玲奈's avatar 神楽坂玲奈

width style var

parent 31879168
......@@ -113,22 +113,24 @@ class Deck extends Spine.Controller
last_item = null
for el in $('.card_usage')
item = $(el).tmplItem().data
card_id = $(el).tmplItem().data.card_id
side = $(el).parent().hasClass('side')
if last_item
if last_item.card_id == item.card_id and last_item.side == item.side
if last_item.card_id == card_id and last_item.side == side
last_item.count++
else
card_usages.push last_item
last_item = {card_id: item.card_id, side: item.side, count: 1}
last_item = {card_id: card_id, side: side, count: 1}
else
last_item = {card_id: item.card_id, side: item.side, count: 1}
last_item = {card_id: card_id, side: side, count: 1}
card_usages.push last_item
CardUsage.refresh card_usages, clear: true
).disableSelection();
if $('.operate_area').hasClass('text')
@el.jscroll({W: "12px", Btn:
{btn: false}});
{btn: false}})
else
@url = "http://my-card.in/decks/?name=#{@deck_name}&cards=#{@encode()}"
......
......@@ -282,28 +282,29 @@
$(".deck_part").sortable({
connectWith: ".deck_part",
stop: function() {
var card_usages, el, item, last_item, _j, _len1, _ref1;
var card_id, card_usages, el, last_item, side, _j, _len1, _ref1;
card_usages = [];
last_item = null;
_ref1 = $('.card_usage');
for (_j = 0, _len1 = _ref1.length; _j < _len1; _j++) {
el = _ref1[_j];
item = $(el).tmplItem().data;
card_id = $(el).tmplItem().data.card_id;
side = $(el).parent().hasClass('side');
if (last_item) {
if (last_item.card_id === item.card_id && last_item.side === item.side) {
if (last_item.card_id === card_id && last_item.side === side) {
last_item.count++;
} else {
card_usages.push(last_item);
last_item = {
card_id: item.card_id,
side: item.side,
card_id: card_id,
side: side,
count: 1
};
}
} else {
last_item = {
card_id: item.card_id,
side: item.side,
card_id: card_id,
side: side,
count: 1
};
}
......@@ -321,6 +322,8 @@
btn: false
}
});
} else {
}
return this.url = "http://my-card.in/decks/?name=" + this.deck_name + "&cards=" + (this.encode());
};
......
......@@ -176,7 +176,8 @@ body{margin:0;padding:0;background:#eee;}
border:1px solid #cccccc;padding:5px;margin:14px 0 0 0;background:#F9F9F9;border-radius:6px;font-size:12px;color:#666666;//height:586px;
legend{font-size:14px;color:#666666;margin:0 0 0 8px;font-size:14px;}
//.card_usage{margin: 3px 3px 3px 0; padding: 1px; float: left; width: 44px; height: 64px; }
//.card_usage{margin: 0; float: left; width: 44px; height: 64px; }
/* 一个很神奇的现象,float: left不加的话,Jquery-UI的拖拽不好用,加上去之后没法拖到另一个卡组里... */
}
}
.search_data.graphic{width:162px;height:700px;float:right;
......
......@@ -81,28 +81,28 @@
<script id="deck_template" type="text/x-jquery-tmpl">
<fieldset id="deck_main">
<legend id="deck_main_title" class="deck_title main">主卡组
<small>(${main.length}:
<small>(${main_count}:
{{each category_count}}
<span class="deck_category_count ${$index}">${$value}</span>{{/each}})
</small>
</legend>
<div class="deck_part main">
<div class="deck_part main" style="width:${main_count}px">
{{tmpl(main) '#card_usage_' + ($('.operate_area').hasClass('text') ? 'text' : 'graphic') + '_template'}}
</div>
</fieldset>
<fieldset id="deck_side">
<legend id="deck_side_title" class="deck_title main">副卡组
<small>(${side.length})</small>
<small>(${side_count})</small>
</legend>
<div class="deck_part side">
<div class="deck_part side" style="width:${main_count}px">
{{tmpl(side) '#card_usage_' + ($('.operate_area').hasClass('text') ? 'text' : 'graphic') + '_template'}}
</div>
</fieldset>
<fieldset id="deck_extra">
<legend id="deck_extra_title" class="deck_title main">额外卡组
<small>(${extra.length})</small>
<small>(${extra_count})</small>
</legend>
<div class="deck_part extra">
<div class="deck_part extra" style="width:${main_count}px">
{{tmpl(extra) '#card_usage_' + ($('.operate_area').hasClass('text') ? 'text' : 'graphic') + '_template'}}
</div>
</fieldset>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment