2.0

Author: paulpflug

README.md

@@ -9,6 +9,8 @@ Fires an event on a specific scroll position
 
 ```sh
 npm install --save-dev vue-scrollfire
+// [email protected]
+npm install --save-dev vue-scrollfire@1
 ```
 or include `build/bundle.js`.
 
@@ -44,8 +46,11 @@ progress |  will be fired on scrolling of viewport. Argument: `{top,bottom}`
 left |  will be fired on leaving of viewport
 
 ## Changelog
+- 2.0.0  
+added vue 2.0.0 compatibility  
+`Number` props must be set like this `:after=100`, this isn't working anymore: `after=100`  
 
-- 1.0.0
+- 1.0.0  
 now has `left` event  
 uses parent for size calculation  
 

dev/basic.vue

@@ -3,11 +3,11 @@
   a(href="https://github.com/vue-comps/vue-comps-scrollspy/blob/master/dev/basic.vue") source
   p open console and scroll down
   p try reloading the page at the bottom to see the effect of `initial` prop and scroll up
-  div(style="margin-top:1500px;width:200px;height:200px;background-color:blue",v-el:div) div
+  div(style="margin-top:1500px;width:200px;height:200px;background-color:blue",ref="div") div
     scrollfire(@entered="entered", @left="left", @progress="progress", multiple)
-    scrollfire(@entered="enteredOffset",@left="leftOffset",offset=200)
-    scrollfire(@entered="enteredNegativOffset",offset=-200)
-    scrollfire(@entered="enteredAfter",after=1000)
+    scrollfire(@entered="enteredOffset",@left="leftOffset",:offset=200)
+    scrollfire(@entered="enteredNegativOffset",:offset=-200)
+    scrollfire(@entered="enteredAfter",:after=1000)
     scrollfire(@entered="initial", @left="initialLeft", initial)
 </template>
 

package.json

@@ -17,33 +17,33 @@
     "node": "*"
   },
   "dependencies": {
-    "vue-mixins": "^0.3.0"
+    "vue-mixins": "^0.3.4"
   },
   "devDependencies": {
     "chai": "^3.5.0",
     "chai-spies": "^0.7.1",
     "coffee-loader": "^0.7.2",
-    "coffee-script": "^1.10.0",
+    "coffee-script": "^1.11.1",
     "gh-pages": "^0.11.0",
-    "karma": "^1.2.0",
+    "karma": "^1.3.0",
     "karma-chai": "^0.1.0",
     "karma-chai-dom": "^1.1.0",
     "karma-chai-spies": "^0.1.4",
     "karma-chrome-launcher": "^2.0.0",
     "karma-firefox-launcher": "^1.0.0",
-    "karma-mocha": "^1.1.1",
+    "karma-mocha": "^1.2.0",
     "karma-sourcemap-loader": "^0.3.7",
     "karma-spec-reporter": "^0.0.26",
-    "karma-vue-component": "^0.1.0",
+    "karma-vue-component": "^2.0.1",
     "karma-webpack": "^1.8.0",
-    "mocha": "^3.0.2",
+    "mocha": "^3.1.2",
     "pug": "^2.0.0-beta6",
-    "script-runner": "^0.1.5",
-    "vue": "^1.0.26",
-    "vue-compiler": "^0.3.0",
-    "vue-dev-server": "^0.2.10",
+    "script-runner": "^0.1.6",
+    "vue": "^2.0.3",
+    "vue-compiler": "^2.0.0",
+    "vue-dev-server": "^2.0.1",
     "vue-html-loader": "^1.2.3",
-    "vue-loader": "^8.5.2",
+    "vue-loader": "^9.7.0",
     "webpack": "^1.13.2"
   },
   "keywords": [

src/scrollfire.vue

@@ -65,12 +65,13 @@ module.exports =
     getHeight: ->
       @height = @getViewportSize().height
   compiled: ->
+
+
+  mounted: -> @$nextTick ->
     @state = {entered:false,left:false}
     @getHeight()
     @onWindowResize @getHeight
     @disposeListener = @onWindowScroll @processScroll
-
-  ready: ->
     @target = if @ignoreParent then @$el else @$el.parentElement
     @processScroll()
 

test/scrollfire.coffee

@@ -13,7 +13,7 @@ describe "scrollfire", ->
   describe "basic env", ->
 
     before (done) ->
-      basic.compiled = ->
+      basic.created = ->
         @entered = chai.spy("entered")
         @left = chai.spy("left")
         @progress = chai.spy("progress")
@@ -32,7 +32,7 @@ describe "scrollfire", ->
       #unloadComp(env)
 
     it "should work on scrolling down", (done) ->
-      box = env.$els.div.getBoundingClientRect()
+      box = env.$refs.div.getBoundingClientRect()
       top = box.top
       bottom = box.bottom
       timeoutCalled = false
@@ -63,26 +63,27 @@ describe "scrollfire", ->
       timeoutCalled = false
       finished = false
       scroll 4000, ->
-        env.$destroy(true)
+        document.body.removeChild(env.$el)
+        env.$destroy()
         env = loadComp(basic)
-        env.$nextTick ->
+        env.$nextTick -> env.$nextTick ->
           env.initial.should.be.called.once
           env.initialLeft.should.be.called.once
-          scroll env.$els.div.offsetTop+env.$els.div.offsetHeight+200, ->
+          scroll env.$refs.div.offsetTop+env.$refs.div.offsetHeight+200, ->
             env.enteredNegativOffset.should.be.called.once
-            scroll env.$els.div.offsetTop+env.$els.div.offsetHeight, ->
+            scroll env.$refs.div.offsetTop+env.$refs.div.offsetHeight, ->
               env.entered.should.be.called.once
               setTimeout (->
                 env.enteredAfter.should.be.called.once
                 timeoutCalled = true
                 done() if finished
                 ),1010
-              scroll env.$els.div.offsetTop + env.$els.div.offsetHeight - 200, ->
+              scroll env.$refs.div.offsetTop + env.$refs.div.offsetHeight - 200, ->
                 env.enteredOffset.should.be.called.once
                 env.progress.should.be.called.once
-                scroll env.$els.div.offsetTop - vp.height, ->
+                scroll env.$refs.div.offsetTop - vp.height, ->
                   env.left.should.be.called.once
-                  scroll env.$els.div.offsetTop - vp.height - 200, ->
+                  scroll env.$refs.div.offsetTop - vp.height - 200, ->
                     env.left.should.be.called.once
                     finished = true
                     done() if timeoutCalled