carte-server 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a988b4ffc64e624ab4703f6978e40eaec2d3e32d
-  data.tar.gz: 5e4a4519d061bf29a4b89006430812b7a7a446b9
+  metadata.gz: d81ce3e8c26a94618aac1527f475ba4a8fae8a7a
+  data.tar.gz: c555caad49ebb424cd41bcd65a2328cab83d3374
 SHA512:
-  metadata.gz: 9979a1dc96578eead74536780ad69eeea39e2a529438ce6164c790d9ea582ef5ed3adccee58dcbbaca1a695578b60fb74194a71d6543890ce9f6fe911dcff586
-  data.tar.gz: e136696b82768ec243296ee587f905c46dbc111f7bccfed643670aab2faafe2a212bb0b3c7094e25a992ebf2a60919c34a67bdf53457e6fa38c5b4a650b60e69
+  metadata.gz: 820d0748a05bc04fcfd3aa45d48c85cf71799157ae7996b0c13aa07c72762bc1ea6ddeef8ee63de61a9a012f364bb38e72ad4c58e4a8e0680e07c25fe7c6b2b2
+  data.tar.gz: 62f67eb92f36ffcccfc4f92b87f18e3e8b0604c4d9f2399367e118a8ce18f3f42406c404e5a500be33f325e4e7a6a0677bf2e28e2cf5762d7c4daea8d1db2b72

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

@@ -14,11 +14,13 @@ Button = require('react-bootstrap').Button
 window.onerror = (error, url, line) -> alert error
 
 Flash = React.createClass
+  scrollEventNames: ['touchstart', 'touchmove', 'touchend', 'gesturestart', 'gesturechange', 'gestureend']
+
   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()
+    for eventName in @scrollEventNames
+      $(document).on eventName, @preventScroll
 
     @setState currCards: @props.cards
 
@@ -37,6 +39,8 @@ Flash = React.createClass
   componentWillUnmount: ->
     console.log '[views/flash] FlashMain componentWillUnmount'
     $(document).off 'keydown', @onKeyDown
+    for eventName in @scrollEventNames
+      $(document).off eventName, @preventScroll
 
   onKeyDown: (event)->
     switch event.keyCode
@@ -44,6 +48,11 @@ Flash = React.createClass
       when 37 then @onClickPrev()
       when 39 then @onClickNext()
 
+  preventScroll: (event)->
+    tagName = event.target.tagName.toLowerCase()
+    return if tagName == 'button' || tagName == 'a'
+    event.preventDefault()
+
   getInitialState: ->
     currCard: null
     currCards: null
@@ -186,6 +195,9 @@ Flash = React.createClass
   onClickMenuItem: (params)->
     ()=> window.location.hash = '#/?' + @queryParam(params)
 
+  onTouchStartTools: (event)->
+    event.stopPropagation()
+
   render: ->
     clearInterval @interval if @interval
     if @props.cards.query.auto != 'off'
@@ -194,10 +206,9 @@ Flash = React.createClass
         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}>
+      <div onTouchStart={@onTouchStartTools} 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)}>
@@ -265,6 +276,7 @@ module.exports = React.createClass
 
   componentWillUnmount: ->
     console.log '[views/slideshow] componentWillUnmount'
+    React.unmountComponentAtNode(@node)
     document.body.removeChild(@node)
 
   renderSlideshow: ->

data/package.json

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carte-server
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - tily