lib/carte/client/views/content.cjsx in carte-server-1.0.1 vs lib/carte/client/views/content.cjsx in carte-server-1.0.2

- old
+ new

@@ -19,25 +19,23 @@ componentWillUnmount: -> console.log '[views/content] component will unmount' @props.router.off "route", @callback render: -> + console.log '[views/content] render' <div className="carte-content"> { switch @props.router.current when "list" + console.log '[views/content] list', @props cards = new CardCollection() cards.query = $.extend {}, config.default_query, @props.router.query cards.fetching = true cards.fetch success: ()-> cards.fetching = false - #title = [] - #for k, v of cards.query - # title.push(String(k).capitalize() + ': ' + v) - #title = title.join(', ') - #title = config.title + ' (' + title + ')' - #document.title = title if cards.query.mode == 'flash' + cards.query.auto = 'off' if !cards.query.auto + cards.query.hide = 'none' if !cards.query.hide document.title = config.title + '、スライドショー' <Slideshow key='slideshow' router={@props.router} cards={cards} /> else document.title = config.title <List key='list' router={@props.router} cards={cards} /> @@ -61,8 +59,8 @@ error: (card, response)=> cards.fetching = false document.title = config.title + '、' + card.get('title') <List key='show' cards={cards} card={card} /> else - <div>Loading ...</div> + null } </div>