revelry_core 0.1.8.5 → 0.1.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a324ec06106a98b91e552c5ab73cea21db1dfab7
-  data.tar.gz: 4d946a5cb3ad544904e748648b3aa5092c1f97fd
+  metadata.gz: 8d1c5bae2ead04314059f61e155f62d899b64cde
+  data.tar.gz: 05fb5a222e9fd616931a23bb32de9bcafb46e24e
 SHA512:
-  metadata.gz: 68043e9e242c83d5f62f4229d06d236d26a7e3f990d1cfbfdda6cb3ccc3801ab71ccb72fccbd314fee1e7ddb4de3fe1168e8e792cf343be2ed92ec41ed75b189
-  data.tar.gz: a8c3a48ab36030a00b24358c9d8d27fc88e81efa1b60ced672fac0406865a5ac216a03f9852e967d8204fb438b6c95124413f3c44a6c71f7af23c18af1b9fc9e
+  metadata.gz: c6028506e32c7fb7dab9fa66c852a462834e22faa70c59f5e3f13300431b0815133aac8232c6b7534f1001fbdae671575b1e245bdd7ed280134af3327e80982e
+  data.tar.gz: ed06af74b8acf0667d6910f195bfdf9b082ae670c8cbb235207ea71d619eb4ce7169fe7c823d30b5efdee48d7d716952c6f624ef2b7a5e1a28cf26e8f4c764dc

data/app/assets/javascripts/revelry/router/router.js.coffee.erb

@@ -2,8 +2,6 @@
 <%# Ensure routes are loaded during precompile. %>
 <% Rails.application.reload_routes! %>
 
-CSSTransitionGroup = React.addons.CSSTransitionGroup
-
 Rev.registerComponent 'Router',
   ### CLASS METHODS ###
 
@@ -45,31 +43,12 @@ Rev.registerComponent 'Router',
 
   mixins: [Backbone.Events]
 
-  getDefaultProps: ->
-    loadingScreenDelay: 800
-
   getInitialState: ->
     bbRouter: new Backbone.Router(Rev.Components.Router.routerConfig())
     # Seed the path and options (which we pass down to child components) from
     # the initial props we received. Updates will come from the AJAX prop fetch.
     path: @props.path
     options: @props.options
-    isLoading: false
-
-  # Loading state is just used to show the loading screen or not.
-  # Best practice is to introduce a delay before showing a loading screen.
-  # Below a certain time threshold, users actually prefer to not see that crap.
-  # Configure the delay with @props.loadingScreenDelay
-  setLoading: (isLoading) ->
-    if isLoading
-      unless @_loadingTimeoutHandle?
-        fn = () => @setState isLoading: true
-        @_loadingTimeoutHandle = setTimeout fn, @props.loadingScreenDelay
-    else
-      if @_loadingTimeoutHandle?
-        clearTimeout @_loadingTimeoutHandle
-        delete @_loadingTimeoutHandle
-      @setState isLoading: false
 
   componentDidMount: ->
     # Start history to pay attention to pushState and hashChange events
@@ -89,7 +68,7 @@ Rev.registerComponent 'Router',
     "/#{baseUrl}?#{if query? and query.length then '&' else ''}#{encodeURIComponent '__props'}"
 
   # Fall back to full page navigation request
-  doFailureFallback: ->
+  onPropsFetchFailure: ->
     window.location = @locationURL()
 
   # Make a handler for successful props fetching of a given templatePath
@@ -98,57 +77,27 @@ Rev.registerComponent 'Router',
     return (data, textStatus, xhr)=>
       try
         @setState path: templatePath, options: JSON.parse(data)
-        @setLoading false
         window.scrollTo 0, 0
       catch err
-        @doFailureFallback()
+        @onPropsFetchFailure()
 
   routeChangeHandler: (templatePath, params)->
-    @setLoading true
     # Request the same props from the server that we would get for a server-side
     # render. If we get them back successfully, swap the page. If we fail, fall
     # back to server side render.
-    @_xhr.abort() if @_xhr?
-    @_xhr = Backbone.ajax
+    Backbone.ajax
       url: @locationURL()
       beforeSend: (xhr) ->
         xhr.setRequestHeader "Content-Type", "text/reactprops"
         xhr.setRequestHeader "Accept", "text/reactprops"
       success: @makePropsFetchSuccessHandler(templatePath)
-      error: @onRouteChangeError
+      error: @onPropsFetchFailure
     true
 
-  onRouteChangeError: (xhr) ->
-    # Aborts aren't really errors.
-    @doFailureFallback unless xhr.statusText == "abort"
-
-  getKey: (isInCSSTransitionGroup) ->
-    # We never need to compute any keys at all unless we're not using CSSTransitionGroup.
-    if isInCSSTransitionGroup
-      # We can use a generic key for the loading screen.
-      if @state.isLoading
-        'GENERIC_ROUTER_KEY'
-      # Actual screens need a unique computed key to tell the CSSTransitionGroup something changed.
-      else
-        JSON.stringify path: @state.path, options: @state.options
-
-  # Show a loading screen if we're loading. Show the content if we're done.
-  renderInner: (isInCSSTransitionGroup = false) ->
-    <div className="RevRouter" key={@getKey isInCSSTransitionGroup}>
+  render: ->
+    <div className="RevRouter">
       {
-        if @state.isLoading
-          @props.loadingScreen or <h1 className="RevRouter-loadingScreen">Loading...</h1>
-        else
-          React.Children.map @props.children, (child)=>
-            React.addons.cloneWithProps child, { path: @state.path, options: @state.options }
+        React.Children.map @props.children, (child)=>
+          React.addons.cloneWithProps child, { path: @state.path, options: @state.options }
       }
     </div>
-
-  render: ->
-    # If you give it a transitionName, it will wrap everything in a CSSTransitionGroup
-    # All props are passed down, so Router can take any props that a CSSTransitionGroup can.
-    if @props.transitionName
-      <CSSTransitionGroup {...@props}>{@renderInner(true)}</CSSTransitionGroup>
-    # No transitionName? Don't do anything fancy.
-    else
-      @renderInner()

data/lib/revelry_core/version.rb

@@ -1,5 +1,5 @@
 module Revelry
   module Core
-    VERSION = "0.1.8.5"
+    VERSION = "0.1.8.6"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: revelry_core
 version: !ruby/object:Gem::Version
-  version: 0.1.8.5
+  version: 0.1.8.6
 platform: ruby
 authors:
 - Revelry Labs, LLC
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-29 00:00:00.000000000 Z
+date: 2015-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -1791,7 +1791,6 @@ files:
 - spec/dummy/tmp/cache/assets/development/sprockets/v3.0/zYuAn7ok3miLpnLjpj72Tuvb69JIuEwWpMMVROg_vEk.cache
 - spec/dummy/tmp/cache/assets/development/sprockets/v3.0/zyXy4f2iOKrEzsb1Irn7ye_Kfhqi0E081jwJ3q7een8.cache
 - spec/dummy/tmp/cache/assets/development/sprockets/v3.0/zZLUfxFok429p9xqH1sKAQwSqVLN329IAWCfWYsAZhY.cache
-- spec/dummy/tmp/pids/server.pid
 - spec/dummy/tmp/react-rails/JSXTransformer.js
 - spec/dummy/tmp/react-rails/react.js
 - spec/javascripts/components/main_spec.js
@@ -3191,7 +3190,6 @@ test_files:
 - spec/dummy/tmp/cache/assets/development/sprockets/v3.0/zYuAn7ok3miLpnLjpj72Tuvb69JIuEwWpMMVROg_vEk.cache
 - spec/dummy/tmp/cache/assets/development/sprockets/v3.0/zyXy4f2iOKrEzsb1Irn7ye_Kfhqi0E081jwJ3q7een8.cache
 - spec/dummy/tmp/cache/assets/development/sprockets/v3.0/zZLUfxFok429p9xqH1sKAQwSqVLN329IAWCfWYsAZhY.cache
-- spec/dummy/tmp/pids/server.pid
 - spec/dummy/tmp/react-rails/JSXTransformer.js
 - spec/dummy/tmp/react-rails/react.js
 - spec/javascripts/components/main_spec.js

data/spec/dummy/tmp/pids/server.pid

@@ -1 +0,0 @@
-49396