Commit 6cf4f1b7 authored by 神楽坂玲奈's avatar 神楽坂玲奈

prevent show menu when right click cardusage

parent 0b3bfa9f
...@@ -34,16 +34,16 @@ class Card extends Spine.Model ...@@ -34,16 +34,16 @@ class Card extends Spine.Model
i++ i++
{ {
id: card._id id: card._id
alias: card.alias alias: card.alias
name: lang.name name: lang.name
card_type: card_type card_type: card_type
type: (i = 0; (i++ until lang.race >> i & 1); @types[i]) if lang.race type: (i = 0; (i++ until lang.race >> i & 1); @types[i]) if lang.race
attribute: (i = 0; (i++ until lang.attribute >> i & 1); @_attributes[i]) if lang.attribute attribute: (i = 0; (i++ until lang.attribute >> i & 1); @_attributes[i]) if lang.attribute
level: card.level level: card.level
atk: card.atk atk: card.atk
def: card.def def: card.def
description: lang.desc description: lang.desc
} }
) )
@refresh cards @refresh cards
...@@ -69,7 +69,7 @@ class Deck extends Spine.Controller ...@@ -69,7 +69,7 @@ class Deck extends Spine.Controller
for card_usage in @main.concat @extra, @side for card_usage in @main.concat @extra, @side
c = card_usage.side << 29 | card_usage.count << 27 | card_usage.card_id c = card_usage.side << 29 | card_usage.count << 27 | card_usage.card_id
for i in [4..0] for i in [4..0]
result += @key.charAt((c >> i*6) & 0x3F) result += @key.charAt((c >> i * 6) & 0x3F)
result result
decode: (str)-> decode: (str)->
card_usages = for i in [0...str.length] by 5 card_usages = for i in [0...str.length] by 5
...@@ -80,8 +80,7 @@ class Deck extends Spine.Controller ...@@ -80,8 +80,7 @@ class Deck extends Spine.Controller
side = decoded >> 29 side = decoded >> 29
count = decoded >> 27 & 0x3 count = decoded >> 27 & 0x3
{card_id: card_id, side: side, count: count} {card_id: card_id, side: side, count: count}
Card.query {_id: Card.query {_id: { $in: card_usage.card_id for card_usage in card_usages}}, =>
{ $in: card_usage.card_id for card_usage in card_usages}}, =>
CardUsage.refresh card_usages, clear: true CardUsage.refresh card_usages, clear: true
render: => render: =>
...@@ -113,13 +112,11 @@ class Deck extends Spine.Controller ...@@ -113,13 +112,11 @@ class Deck extends Spine.Controller
{btn: false}}); {btn: false}});
@url = "http://my-card.in/decks/?name=#{@deck_name}&cards=#{@encode()}" @url = "http://my-card.in/decks/?name=#{@deck_name}&cards=#{@encode()}"
#alert @url #alert @url
#$('#deck_url_ydk').attr 'download', Deck.deck_name + '.ydk' #$('#deck_url_ydk').attr 'download', Deck.deck_name + '.ydk'
#$('#deck_url_ydk').attr 'href', 'data:application/octet-stream,' + (card_usage.card_id for i in ).concat((card_usage.card_id for i in [0...card_usage.count] for card_usage in @extra), ["!side"], (card_usage.card_id for i in [0...card_usage.count] for card_usage in @side)).join("%0a") #$('#deck_url_ydk').attr 'href', 'data:application/octet-stream,' + (card_usage.card_id for i in ).concat((card_usage.card_id for i in [0...card_usage.count] for card_usage in @extra), ["!side"], (card_usage.card_id for i in [0...card_usage.count] for card_usage in @side)).join("%0a")
tab_control: -> tab_control: ->
$(".bottom_area div").click -> $(".bottom_area div").click ->
$(this).addClass("bottom_button_active").removeClass("bottom_button") $(this).addClass("bottom_button_active").removeClass("bottom_button")
...@@ -146,26 +143,27 @@ class Deck extends Spine.Controller ...@@ -146,26 +143,27 @@ class Deck extends Spine.Controller
if count < 3 #TODO: lflist if count < 3 #TODO: lflist
card_usage.count++ card_usage.count++
card_usage.save() card_usage.save()
history.pushState(null,@deck_name, @url) history.pushState(null, @deck_name, @url)
minus: (e)-> minus: (e)->
e.preventDefault()
card_usage = $(e.target).tmplItem().data card_usage = $(e.target).tmplItem().data
card_usage.count-- card_usage.count--
if card_usage.count if card_usage.count
card_usage.save() card_usage.save()
else else
card_usage.destroy() card_usage.destroy()
history.pushState(null,@deck_name, @url) history.pushState(null, @deck_name, @url)
return false #TODO: prevent showing menu
$(document).ready -> $(document).ready ->
$('#name').html $.url().param('name') $('#name').html $.url().param('name')
$( "#deck_share_dialog" ).dialog $("#deck_share_dialog").dialog
modal: true modal: true
autoOpen: false autoOpen: false
$('#deck_share').click -> $('#deck_share').click ->
$("#deck_url").val $("#deck_url").val
$( "#deck_share_dialog" ).dialog('open') $("#deck_share_dialog").dialog('open')
#$.ajax({url: 'https://www.googleapis.com/urlshortener/v1/url', type: 'POST', data:JSON.stringify({longUrl: 'http://my-card.in/'}), contentType: 'application/json; charset=utf-8', success: function(data){alert(data)} })" #$.ajax({url: 'https://www.googleapis.com/urlshortener/v1/url', type: 'POST', data:JSON.stringify({longUrl: 'http://my-card.in/'}), contentType: 'application/json; charset=utf-8', success: function(data){alert(data)} })"
$.i18n.properties $.i18n.properties
...@@ -178,7 +176,7 @@ $(document).ready -> ...@@ -178,7 +176,7 @@ $(document).ready ->
deck.deck_name = $.url().param('name') deck.deck_name = $.url().param('name')
deck.tab_control() deck.tab_control()
deck.decode $.url().param('cards') deck.decode $.url().param('cards')
#window.addEventListener 'popstate', (ev)-> #window.addEventListener 'popstate', (ev)->
# alert ev.state # alert ev.state
#if ev.state #if ev.state
# CardUsage.refresh ev.state, clear: true # CardUsage.refresh ev.state, clear: true
\ No newline at end of file \ No newline at end of file
...@@ -338,6 +338,7 @@ ...@@ -338,6 +338,7 @@
Deck.prototype.minus = function(e) { Deck.prototype.minus = function(e) {
var card_usage; var card_usage;
e.preventDefault();
card_usage = $(e.target).tmplItem().data; card_usage = $(e.target).tmplItem().data;
card_usage.count--; card_usage.count--;
if (card_usage.count) { if (card_usage.count) {
...@@ -345,8 +346,7 @@ ...@@ -345,8 +346,7 @@
} else { } else {
card_usage.destroy(); card_usage.destroy();
} }
history.pushState(null, this.deck_name, this.url); return history.pushState(null, this.deck_name, this.url);
return false;
}; };
return Deck; return Deck;
......
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