Skip to content

Fix for new API changes in meteor v0.9.1 #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 8, 2014
Merged

Fix for new API changes in meteor v0.9.1 #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a1fe96
Fix for new API changes in meteor v0.9.1
bitspook Sep 6, 2014
d9ccef5
Bump api.versionsFrom in package.js to 0.9.1
bitspook Sep 6, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ function getFilesFromFolder(packageName, folder){
}

Package.onUse(function (api) {
api.versionsFrom("METEOR@0.9.0");
api.versionsFrom("METEOR@0.9.1");

var _ = Npm.require("underscore");

Expand Down
20 changes: 10 additions & 10 deletions sharejs-client.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ class ShareJSConnector
# Create a ReactiveVar that tracks the docId that was passed in
docIdVar = new Blaze.ReactiveVar

parentView.onRendered ->
parentView.onViewReady ->
this.autorun ->
data = Blaze.getCurrentData()
data = Template.currentData()
docIdVar.set(data.docid)

parentView.onDestroyed =>
parentView.onViewDestroyed =>
this.destroy()

@isCreated = false
Expand All @@ -28,8 +28,8 @@ class ShareJSConnector
@isCreated = true

@view = @createView()
@view.onRendered ->
connector.rendered( this.domrange.firstNode() )
@view.onViewReady ->
connector.rendered( this._domrange.firstNode() )

this.autorun ->
# By grabbing docId here, we ensure that we only try to connect when
Expand Down Expand Up @@ -84,12 +84,12 @@ class ShareJSConnector
class ShareJSAceConnector extends ShareJSConnector
constructor: (parentView) ->
super
params = Blaze.getViewData(parentView)
params = Blaze.getData(parentView)
@configCallback = params.onRender || params.callback # back-compat
@connectCallback = params.onConnect

createView: ->
return Blaze.With(Blaze.getCurrentData, -> Template._sharejsAce)
return Blaze.With(Template.currentData, -> Template._sharejsAce)

rendered: (element) ->
super
Expand Down Expand Up @@ -120,7 +120,7 @@ class ShareJSAceConnector extends ShareJSConnector

class ShareJSTextConnector extends ShareJSConnector
createView: ->
return Blaze.With(Blaze.getCurrentData, -> Template._sharejsText)
return Blaze.With(Template.currentData, -> Template._sharejsText)

rendered: (element) ->
super
Expand All @@ -144,10 +144,10 @@ class ShareJSTextConnector extends ShareJSConnector
# Meteor._debug "destroying textarea editor"
@textarea = null

UI.registerHelper "sharejsAce", Template.__create__('sharejsAce', ->
UI.registerHelper "sharejsAce", new Template('sharejsAce', ->
return new ShareJSAceConnector(this).create()
)

UI.registerHelper "sharejsText", Template.__create__('sharejsText', ->
UI.registerHelper "sharejsText", new Template('sharejsText', ->
return new ShareJSTextConnector(this).create()
)