lib/carte/client/views/content.cjsx in carte-server-1.0.7 vs lib/carte/client/views/content.cjsx in carte-server-1.0.8

- old
+ new

@@ -2,10 +2,11 @@ $ = require('jquery') React = require('react') List = require('./list') Slideshow = require('./slideshow') CardCollection = require('../models/cards') +CardHistoryCollection = require('../models/card_histories') CardModel = require('../models/card') String = require('string') config = require('../config') module.exports = React.createClass @@ -32,21 +33,24 @@ cards.fetching = true cards.fetch success: ()-> cards.fetching = false 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 + '、スライドショー' + 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} /> when "show" cards = new CardCollection() cards.fetching = true card = new CardModel(title: @props.router.title) + card.query = $.extend {}, {context: 'updated_at'}, @props.router.query + card.fetching = true card.fetch success: (card)-> + card.fetching = false for left in card.get("lefts") cardModel = new CardModel(left) cardModel.set 'focused', false cards.add cardModel card.set 'focused', true @@ -58,9 +62,18 @@ cards.fetching = false error: (card, response)=> cards.fetching = false document.title = config.title + '、' + card.get('title') <List key='show' cards={cards} card={card} /> + when "history" + console.log '[views/content] history', @props + cards = new CardHistoryCollection() + console.log cards + cards.title = @props.router.title + cards.fetching = true + cards.fetch success: ()-> cards.fetching = false + document.title = config.title + '、ヒストリー' + <List key='list' router={@props.router} cards={cards} /> else null } </div>