carte-server 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 132ae5812e302de8c0d26fa7fc7f976317aadc02
-  data.tar.gz: f8c1dbf6608dc043567eb942351be1f8d9b60b07
+  metadata.gz: 38ff867c838212facdf04eceb6479aba9f084adf
+  data.tar.gz: e366d1aefe102821f4a010548f44ea82e22e7685
 SHA512:
-  metadata.gz: 379fe71b54212b0a6e5c5a7841ce43429aafea15ae5109488766848566f5a9e400c530f83308c4a02e6430b7274b1dfe3ae59f5f85cb306aec14e09425f93dc5
-  data.tar.gz: cb3eb492d5e6ad1f97cead588ea87d8593816ff078a743accc4e19eda483aaa2c57cd0566d831592a9990c2748df02599c67553fb0de0da4fd320b971e6d9de4
+  metadata.gz: 2076727a9393edaa380e0deee1d8f7342889e4ab45409aec58691fd129c6a3cfa3ba14b1c29a48feba6540c791d3f8f3ca611eddc9b5bf8a68528f36503242e8
+  data.tar.gz: 5835726ec6f54293d5cd70f9915c557aabaf1205ca518b7b29e685300634bf5626921a993cf284098c79a3e535c6e24baab5906759e12b27246404ed8de552f1

data/lib/carte/client/tasks.coffee

@@ -3,6 +3,7 @@ path = require 'path'
 gulp = require 'gulp'
 gulpUtil = require 'gulp-util'
 gulpIf = require 'gulp-if'
+gulpGzip = require 'gulp-gzip'
 sourceStream = require 'vinyl-source-stream'
 browserify = require 'browserify'
 watchify = require 'watchify'
@@ -75,4 +76,5 @@ module.exports = class Carte
       .bundle()
       .pipe sourceStream file
       .pipe gulpIf(!@watching, streamify(uglify(compress: {drop_console: !@watching})))
+      .pipe gulpIf(!@watching, gulpGzip())
       .pipe gulp.dest dir

data/lib/carte/client/views/content.cjsx

@@ -21,21 +21,19 @@ module.exports = React.createClass
     @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
@@ -63,6 +61,6 @@ module.exports = React.createClass
             document.title = config.title + '、' + card.get('title')
             <List key='show' cards={cards} card={card} />
           else
-            <div>Loading ...</div>
+            null
       }
     </div>

data/lib/carte/client/views/slideshow.cjsx

@@ -1,31 +1,43 @@
 # @cjsx React.DOM 
 $ = require('jquery')
-Backbone = require('backbone')
 React = require('react')
 CardCollection = require('../models/cards')
 config = require('../config')
 helpers = require('../helpers')
 classnames = require('classnames')
 markdownIt = require('markdown-it')(linkify: true)
+DropdownButton = require('react-bootstrap').DropdownButton
+MenuItem = require('react-bootstrap').MenuItem
+ButtonGroup = require('react-bootstrap').ButtonGroup
+Button = require('react-bootstrap').Button
 
 #window.onerror = (error, url, line) -> alert error
 
-Portal = React.createClass
+Flash = React.createClass
   componentDidMount: ->
-    console.log '[views/slideshow] Portal#componentDidMount'
-    @setState currCards: @props.cards
+    console.log '[views/flash] componentDidMount', @props
     $(document).on 'keydown', @onKeyDown
-    @props.cards.on 'sync', =>
-      @setState currCard: @props.cards.at(0)
-      @loadNextCards()
-      @loadPrevCards()
-      @forceUpdate.bind(@, null)
+
+    @setState currCards: @props.cards
+
+    if @props.cards.at(0)
+      @setState currCard: @props.cards.at(0), =>
+        @loadNextCards()
+        @loadPrevCards()
+        @forceUpdate.bind(@, null)
+    else
+      @props.cards.on 'sync', =>
+        @setState currCard: @props.cards.at(0), =>
+          @loadNextCards()
+          @loadPrevCards()
+          @forceUpdate.bind(@, null)
 
   componentWillUnmount: ->
     $(document).off 'keydown', @onKeyDown
 
   onKeyDown: (event)->
     switch event.keyCode
+      when 27 then @props.router.navigate(@closeLink())
       when 37 then @onClickPrev()
       when 39 then @onClickNext()
 
@@ -34,8 +46,9 @@ Portal = React.createClass
     currCards: null
     nextCards: null
     prevCards: null
-    hideValue: 'none'
     hiding: true
+    showTools: false
+    menuOpen: false
 
   prevCard: ->
     _prevCard = @state.currCards.at(@currCardIndex() - 1)
@@ -100,7 +113,7 @@ Portal = React.createClass
         @onClickPrev()
 
   onClickNext: ->
-    if @state.hideValue != 'none' && @state.hiding
+    if @props.cards.query.hide != 'none' && @state.hiding
       @setState hiding: false
     else
       @setState hiding: true
@@ -113,7 +126,7 @@ Portal = React.createClass
             @loadNextCards()
 
   onClickPrev: ->
-    if @state.hideValue != 'none' && @state.hiding
+    if @props.cards.query.hide != 'none' && @state.hiding
       @setState hiding: false
     else
       @setState hiding: true
@@ -128,19 +141,52 @@ Portal = React.createClass
   closeLink: ->
     params = $.extend {}, @props.cards.query
     delete params.mode
+    delete params.auto
+    delete params.hide
     '#/?' + $.param(params)
 
   onChangeHide: (event)->
     @setState hideValue: event.target.value
 
+  onMouseOverTools: ()->
+    @setState showTools: true
+
+  onMouseLeaveTools: ()->
+    @setState showTools: false
+
+  onClick: ->
+    @setState showTools: !@state.showTools
+
+  queryParam: (query)->
+    query = $.extend {}, @props.cards.query, query
+    $.param(query)
+
   render: ->
-    <div className="carte-slideshow" onTouchStart={@onTouchStart} onTouchEnd={@onTouchEnd}>
+    <div onClick={@onClick} onTouchStart={@onTouchStart} onTouchEnd={@onTouchEnd} style={overflow:'hidden'}>
+      <div style={position:'absolute',bottom:0,width:'100%',padding:'47px 0px 0px 0px'} onMouseOver={@onMouseOverTools} onMouseLeave={@onMouseLeaveTools}>
+        <span className={classnames("pull-right":true, 'carte-hidden': !@state.showTools)}>
+          <ButtonGroup>
+            <DropdownButton bsSize='large' bsStyle='default' title={'Auto: ' + @props.cards.query.auto} dropup pullRight className={classnames('open': @state.menuOpen)}>
+              <MenuItem href={'#/?' + @queryParam(auto: "off")} eventKey='1'>off</MenuItem>
+              <MenuItem href={'#/?' + @queryParam(auto: "fast")} eventKey='2'>fast</MenuItem>
+              <MenuItem href={'#/?' + @queryParam(auto: "normal")} eventKey='3'>normal</MenuItem>
+              <MenuItem href={'#/?' + @queryParam(auto: "slow")} eventKey='4'>slow</MenuItem>
+            </DropdownButton>
+            <DropdownButton bsSize='large' bsStyle='default' title={'Hide: ' + @props.cards.query.hide} dropup pullRight className={classnames('open': @state.menuOpen)}>
+              <MenuItem href={'#/?' + @queryParam(hide: "none")} eventKey='1'>none</MenuItem>
+              <MenuItem href={'#/?' + @queryParam(hide: "title")} eventKey='2'>title</MenuItem>
+              <MenuItem href={'#/?' + @queryParam(hide: "content")} eventKey='3'>content</MenuItem>
+            </DropdownButton>
+            <Button bsSize='large' href={@closeLink()}><strong>&times;</strong></Button>
+          </ButtonGroup>
+        </span>
+      </div>
       <div style={fontSize:'10vh',padding:'1vh 5vh',overflow:'hidden'}>
         <div>
           <strong>
             {
               if @state.currCard
-                if @state.hideValue == 'title' && @state.hiding == true
+                if @props.cards.query.hide == 'title' && @state.hiding == true
                   '?????'
                 else
                   @state.currCard.get('title')
@@ -148,22 +194,11 @@ Portal = React.createClass
                 <i className="glyphicon glyphicon-refresh glyphicon-refresh-animate" />
             }
           </strong>
-          <span className="pull-right tools" style={fontSize:'0.5em'}>
-            hide:
-            <select value={@state.hideValue} onChange={@onChangeHide}>
-              <option value="none">none</option>
-              <option value="title">title</option>
-              <option value="content">content</option>
-            </select>
-            <a href={@closeLink()}>
-              <strong>&times;</strong>
-            </a>
-          </span>
         </div>
-        <div style={paddingTop:'5vh'}>
+        <div style={paddingTop:'5vh',overflow:'hidden'}>
           {
             if @state.currCard
-              if @state.hideValue == 'content' && @state.hiding == true
+              if @props.cards.query.hide == 'content' && @state.hiding == true
                 '???????'
               else
                 <div dangerouslySetInnerHTML={__html: markdownIt.render @state.currCard.get('content')} />
@@ -174,14 +209,13 @@ Portal = React.createClass
       </div>
     </div>
 
-MyPortal = React.createFactory Portal
+flash = React.createFactory Flash
 
 module.exports = React.createClass
-  displayName: 'Slideshow'
+  displayName: 'FlashWrapper'
 
   componentDidMount: ->
     console.log '[views/slideshow] componentDidMount'
-    @props.cards.on 'sync', @forceUpdate.bind(@, null)
     @node = document.createElement('div')
     @node.className = 'carte-slideshow'
     document.body.appendChild(@node)
@@ -189,15 +223,18 @@ module.exports = React.createClass
 
   componentWillReceiveProps: (nextProps)->
     console.log '[views/slideshow] componentWillReceiveProps', nextProps
-    nextProps.cards.on 'sync', @forceUpdate.bind(@, null)
+    document.body.removeChild(@node) if @node
+    @node = document.createElement('div')
+    @node.className = 'carte-slideshow'
+    document.body.appendChild(@node)
+    React.render(flash(nextProps), @node)
 
   componentWillUnmount: ->
     console.log '[views/slideshow] componentWillUnmount'
     document.body.removeChild(@node)
 
   renderSlideshow: ->
-    React.render(MyPortal(@props), @node)
+    React.render(flash(@props), @node)
 
   render: ->
-    console.log '[views/slideshow] render', @props
     null

data/package.json

@@ -1,7 +1,7 @@
 {
   "name": "carte-client",
   "description": "something like dictionary, wiki, or information card",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "main": "lib/carte.coffee",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -30,6 +30,7 @@
     "font-awesome": "^4.3.0",
     "fs-extra": "^0.18.2",
     "gulp": "^3.8.11",
+    "gulp-gzip": "^1.1.0",
     "gulp-if": "^1.2.5",
     "gulp-jade": "^1.0.0",
     "gulp-rename": "^1.2.2",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carte-server
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - tily
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-14 00:00:00.000000000 Z
+date: 2015-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler