carte-server 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99769a564e742a16255fc44868be47a9261426b8
-  data.tar.gz: 0ac68e8f661307f16bfa56304458172a88d61d76
+  metadata.gz: a988b4ffc64e624ab4703f6978e40eaec2d3e32d
+  data.tar.gz: 5e4a4519d061bf29a4b89006430812b7a7a446b9
 SHA512:
-  metadata.gz: b693433479183047c08235018ba8b458a2034e60ff86ef25c5810ebf968d78b989d5727c13db32aa8d12ce95b4bfc43f23591d226a66cde3caaf3c1dea2cb03a
-  data.tar.gz: 6991424bc9053579af6c18c5f06362581de4d021924e03fdb3a79337609c818a30f2818b0682ffeb2c981a2c26ee57dff5671609aea56a1833d0d8f8be23a9f3
+  metadata.gz: 9979a1dc96578eead74536780ad69eeea39e2a529438ce6164c790d9ea582ef5ed3adccee58dcbbaca1a695578b60fb74194a71d6543890ce9f6fe911dcff586
+  data.tar.gz: e136696b82768ec243296ee587f905c46dbc111f7bccfed643670aab2faafe2a212bb0b3c7094e25a992ebf2a60919c34a67bdf53457e6fa38c5b4a650b60e69

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

@@ -11,12 +11,14 @@ MenuItem = require('react-bootstrap').MenuItem
 ButtonGroup = require('react-bootstrap').ButtonGroup
 Button = require('react-bootstrap').Button
 
-#window.onerror = (error, url, line) -> alert error
+window.onerror = (error, url, line) -> alert error
 
 Flash = React.createClass
   componentDidMount: ->
     console.log '[views/flash] componentDidMount', @props
     $(document).on 'keydown', @onKeyDown
+    #for eventName in ['touchstart', 'touchmove', 'touchend', 'gesturestart', 'gesturechange', 'gestureend']
+    #  $(document).on eventName, (event)-> event.preventDefault(); event.stopPropagation()
 
     @setState currCards: @props.cards
 
@@ -33,6 +35,7 @@ Flash = React.createClass
           @forceUpdate.bind(@, null)
 
   componentWillUnmount: ->
+    console.log '[views/flash] FlashMain componentWillUnmount'
     $(document).off 'keydown', @onKeyDown
 
   onKeyDown: (event)->
@@ -101,16 +104,38 @@ Flash = React.createClass
     @setState prevCards: prevCards
 
   onTouchStart: (event)->
-    @touchStartX = event.changedTouches[0].pageX
+    touchStart =
+      x: event.touches[0].pageX
+      y: event.touches[0].pageY
+      time: new Date 
+    if !@tapped
+      @tapped = setTimeout =>
+        @touchStart = touchStart
+        @touchDelta = {}
+        @tapped = null
+      , 300
+    else
+      clearTimeout @tapped
+      @tapped = null
+      @setState showTools: !@state.showTools
+
+  onTouchMove: (event)->
+     return if !@touchStart
+     return if ( event.touches.length > 1 || event.scale && event.scale != 1)
+
+     @touchDelta =
+       x: event.touches[0].pageX - @touchStart.x
+       y: event.touches[0].pageY - @touchStart.y
 
   onTouchEnd: (event)->
-    touchEndX = event.changedTouches[0].pageX
-    distance = touchEndX - @touchStartX
-    if Math.abs(distance) > 100
-      if distance > 0
-        @onClickNext()
-      else
-        @onClickPrev()
+    return if !@touchStart
+    duration = new Date - @touchStart.time
+    isValid = Number(duration) < 250 && Math.abs(@touchDelta.x) > 20
+    if @touchDelta.x < 0
+      @onClickNext()
+    else
+      @onClickPrev()
+    @touchStart = null
 
   onClickNext: ->
     if @props.cards.query.hide != 'none' && @state.hiding
@@ -154,28 +179,37 @@ Flash = React.createClass
   onMouseLeaveTools: ()->
     @setState showTools: false
 
-  onClick: ->
-    @setState showTools: !@state.showTools
-
   queryParam: (query)->
     query = $.extend {}, @props.cards.query, query
     $.param(query)
 
+  onClickMenuItem: (params)->
+    ()=> window.location.hash = '#/?' + @queryParam(params)
+
   render: ->
-    <div onClick={@onClick} onTouchStart={@onTouchStart} onTouchEnd={@onTouchEnd} style={overflow:'hidden'}>
+    clearInterval @interval if @interval
+    if @props.cards.query.auto != 'off'
+      bpm = null
+      switch @props.cards.query.auto
+        when 'fast' then bpm = 90
+        when 'normal' then bpm = 60
+        when 'slow' then bpm = 30 
+      console.log 'bpm!!!!!!!!!!!!!!!!!!!!!!!!!!', bpm
+      @interval = setInterval @onClickNext, 1000 * 60 / bpm
+    <div onTouchStart={@onTouchStart} onTouchMove={@onTouchMove} onTouchEnd={@onTouchEnd} style={overflow:'hidden',width:'100%',height:'100%'}>
       <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>
+              <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>
+              <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>

data/package.json

@@ -1,7 +1,7 @@
 {
   "name": "carte-client",
   "description": "something like dictionary, wiki, or information card",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "main": "lib/carte.coffee",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

metadata

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