New users with an email address will receive an address verification email.
","name":"sendVerificationEmail"},{"type":{"names":["Boolean"]},"description":"Calls to createUser from the client will be rejected. In addition, if you are using accounts-ui, the "Create account" link will not be available.
If set to a string, only allows new users if the domain part of their email address matches the string. If set to a function, only allows new users if the function returns true. The function is passed the full email address of the proposed new user. Works with password-based sign-in and external services that expose email addresses (Google, Facebook, GitHub). All existing users still can log in after enabling this option. Example: Accounts.config({ restrictCreationByEmailDomain: 'school.edu' }).
The number of days from when a user logs in until their token expires and they are logged out. Defaults to 90. Set to null to disable login expiration.
When using the oauth-encryption package, the 16 byte key using to encrypt sensitive account credentials in the database, encoded in base64. This option may only be specifed on the server. See packages/oauth-encryption/README.md for details.
Called whenever a login is attempted (either successful or unsuccessful). A login can be aborted by returning a falsy value or throwing an exception.
","name":"func"}],"name":"validateLoginAttempt","longname":"Accounts.validateLoginAttempt","kind":"function","memberof":"Accounts","scope":"static","___id":"T000002R000086","___s":true,"options":[],"locus":"Server"},"onLogin":{"meta":{"range":[1898,1973],"filename":"accounts_server.js","lineno":60,"path":"/Users/dgreenspan/meteor/meteor/packages/accounts-base","code":{"id":"astnode100001089","name":"Accounts.onLogin","type":"FunctionExpression","value":"function","paramnames":["func"]}},"summary":"Register a callback to be called after a login attempt succeeds.","tags":[{"originalTitle":"locus","title":"locus","text":"Server","value":"Server"}],"params":[{"type":{"names":["function"]},"description":"The callback to be called when login is successful.
","name":"func"}],"name":"onLogin","longname":"Accounts.onLogin","kind":"function","memberof":"Accounts","scope":"static","___id":"T000002R000087","___s":true,"options":[],"locus":"Server"},"onLoginFailure":{"meta":{"range":[2155,2244],"filename":"accounts_server.js","lineno":69,"path":"/Users/dgreenspan/meteor/meteor/packages/accounts-base","code":{"id":"astnode100001103","name":"Accounts.onLoginFailure","type":"FunctionExpression","value":"function","paramnames":["func"]}},"summary":"Register a callback to be called after a login attempt fails.","tags":[{"originalTitle":"locus","title":"locus","text":"Server","value":"Server"}],"params":[{"type":{"names":["function"]},"description":"The callback to be called after the login has failed.
","name":"func"}],"name":"onLoginFailure","longname":"Accounts.onLoginFailure","kind":"function","memberof":"Accounts","scope":"static","___id":"T000002R000088","___s":true,"options":[],"locus":"Server"},"onCreateUser":{"meta":{"range":[32747,32906],"filename":"accounts_server.js","lineno":986,"path":"/Users/dgreenspan/meteor/meteor/packages/accounts-base","code":{"id":"astnode100003117","name":"Accounts.onCreateUser","type":"FunctionExpression","value":"function","paramnames":["func"]},"vars":{"onCreateUserHook":null}},"summary":"Customize new user creation.","tags":[{"originalTitle":"locus","title":"locus","text":"Server","value":"Server"}],"params":[{"type":{"names":["function"]},"description":"Called whenever a new user is created. Return the new user object, or throw an Error to abort the creation.
Called whenever a new user is created. Takes the new user object, and returns true to allow the creation or false to abort.
","name":"func"}],"name":"validateNewUser","longname":"Accounts.validateNewUser","kind":"function","memberof":"Accounts","scope":"static","___id":"T000002R000310","___s":true,"options":[],"locus":"Server"},"createUser":{"meta":{"range":[3912,4457],"filename":"password_client.js","lineno":108,"path":"/Users/dgreenspan/meteor/meteor/packages/accounts-password","code":{"id":"astnode100009903","name":"Accounts.createUser","type":"FunctionExpression","value":"function","paramnames":["options","callback"]},"vars":{"options":null,"options.password":null}},"summary":"Create a new user.","tags":[{"originalTitle":"locus","title":"locus","text":"Anywhere","value":"Anywhere"}],"params":[{"type":{"names":["Object"]},"name":"options"},{"type":{"names":["function"]},"optional":true,"description":"Client only, optional callback. Called with no arguments on success, or with a single Error argument on failure.
A unique name for this user.
","name":"username"},{"type":{"names":["String"]},"description":"The user's email address.
","name":"email"},{"type":{"names":["String"]},"description":"The user's password. This is not sent in plain text over the wire.
","name":"password"},{"type":{"names":["Object"]},"description":"The user's profile, typically including the name field.
The user's current password. This is not sent in plain text over the wire.
","name":"oldPassword"},{"type":{"names":["String"]},"description":"A new password for the user. This is not sent in plain text over the wire.
","name":"newPassword"},{"type":{"names":["function"]},"optional":true,"description":"Optional callback. Called with no arguments on success, or with a single Error argument on failure.
Optional callback. Called with no arguments on success, or with a single Error argument on failure.
The email address to send a password reset link.
","name":"email"}],"locus":"Client"},"resetPassword":{"meta":{"range":[8168,8544],"filename":"password_client.js","lineno":226,"path":"/Users/dgreenspan/meteor/meteor/packages/accounts-password","code":{"id":"astnode100010139","name":"Accounts.resetPassword","type":"FunctionExpression","value":"function","paramnames":["token","newPassword","callback"]}},"summary":"Reset the password for a user using a token received in email. Logs the user in afterwards.","tags":[{"originalTitle":"locus","title":"locus","text":"Client","value":"Client"}],"params":[{"type":{"names":["String"]},"description":"The token retrieved from the reset password URL.
","name":"token"},{"type":{"names":["String"]},"description":"A new password for the user. This is not sent in plain text over the wire.
","name":"newPassword"},{"type":{"names":["function"]},"optional":true,"description":"Optional callback. Called with no arguments on success, or with a single Error argument on failure.
The token retrieved from the verification URL.
","name":"token"},{"type":{"names":["function"]},"optional":true,"description":"Optional callback. Called with no arguments on success, or with a single Error argument on failure.
The id of the user to update.
","name":"userId"},{"type":{"names":["String"]},"description":"A new password for the user.
","name":"newPassword"}],"name":"setPassword","longname":"Accounts.setPassword","kind":"function","memberof":"Accounts","scope":"static","___id":"T000002R000827","___s":true,"options":[],"locus":"Server"},"sendResetPasswordEmail":{"meta":{"range":[11744,13104],"filename":"password_server.js","lineno":364,"path":"/Users/dgreenspan/meteor/meteor/packages/accounts-password","code":{"id":"astnode100011172","name":"Accounts.sendResetPasswordEmail","type":"FunctionExpression","value":"function","paramnames":["userId","email"]},"vars":{"user":null,"email":null,"token":null,"when":null,"tokenRecord":null,".reset":null,"resetPasswordUrl":null,"options":null,"options.html":null}},"summary":"Send an email with a link the user can use to reset their password.","tags":[{"originalTitle":"locus","title":"locus","text":"Server","value":"Server"}],"params":[{"type":{"names":["String"]},"description":"The id of the user to send email to.
","name":"userId"},{"type":{"names":["String"]},"optional":true,"description":"Optional. Which address of the user's to send the email to. This address must be in the user's emails list. Defaults to the first email in the list.
The id of the user to send email to.
","name":"userId"},{"type":{"names":["String"]},"optional":true,"description":"Optional. Which address of the user's to send the email to. This address must be in the user's emails list. Defaults to the first email in the list.
The id of the user to send email to.
","name":"userId"},{"type":{"names":["String"]},"optional":true,"description":"Optional. Which address of the user's to send the email to. This address must be in the user's emails list. Defaults to the first unverified email in the list.
Optional callback. Called with no arguments on success, or with a single Error argument on failure.
Optional callback. Called with no arguments on success, or with a single Error argument on failure.
Either a string interpreted as a username or an email; or an object with a single key: email, username or id.
The user's password.
","name":"password"},{"type":{"names":["function"]},"optional":true,"description":"Optional callback. Called with no arguments on success, or with a single Error argument on failure.
The function to call when a new DDP connection is established.
","name":"callback"}],"memberof":"Meteor","name":"onConnection","longname":"Meteor.onConnection","kind":"function","scope":"static","___id":"T000002R064664","___s":true,"options":[],"locus":"Server"},"publish":{"meta":{"range":[45712,47678],"filename":"livedata_server.js","lineno":1370,"path":"/Users/dgreenspan/meteor/meteor/packages/livedata","code":{"id":"astnode100368441","name":"publish","type":"FunctionExpression","value":"function"},"vars":{"self":null,"options":null,"self.warned_about_autopublish":null,"self.publish_handlers[undefined]":null,"":null}},"summary":"Publish a record set.","memberof":"Meteor","tags":[{"originalTitle":"locus","title":"locus","text":"Server","value":"Server"}],"params":[{"type":{"names":["String"]},"description":"Name of the record set. If null, the set has no name, and the record set is automatically sent to all connected clients.
Function called on the server each time a client subscribes. Inside the function, this is the publish handler object, described below. If the client passed arguments to subscribe, the function is called with the same arguments.
Dictionary whose keys are method names and values are functions.
","name":"methods"}],"memberof":"Meteor","name":"methods","longname":"Meteor.methods","kind":"function","scope":"static","___id":"T000002R064682","___s":true,"options":[],"locus":"Anywhere"},"startup":{"meta":{"range":[651,1018],"filename":"startup_client.js","lineno":27,"path":"/Users/dgreenspan/meteor/meteor/packages/meteor","code":{"id":"astnode100388147","name":"Meteor.startup","type":"FunctionExpression","value":"function","paramnames":["cb"]},"vars":{"doScroll":null,"":null}},"summary":"Run code when a client or a server starts.","tags":[{"originalTitle":"locus","title":"locus","text":"Anywhere","value":"Anywhere"}],"params":[{"type":{"names":["function"]},"description":"A function to run on startup.
","name":"func"}],"name":"startup","longname":"Meteor.startup","kind":"function","memberof":"Meteor","scope":"static","___id":"T000002R066213","___s":true,"options":[],"locus":"Anywhere"},"setTimeout":{"meta":{"range":[969,1082],"filename":"timers.js","lineno":28,"path":"/Users/dgreenspan/meteor/meteor/packages/meteor","code":{"id":"astnode100388310","name":"setTimeout","type":"FunctionExpression","value":"function"}},"memberof":"Meteor","summary":"Call a function in the future after waiting for a specified delay.","tags":[{"originalTitle":"locus","title":"locus","text":"Anywhere","value":"Anywhere"}],"params":[{"type":{"names":["function"]},"description":"The function to run
","name":"func"},{"type":{"names":["Number"]},"description":"Number of milliseconds to wait before calling function
","name":"delay"}],"name":"setTimeout","longname":"Meteor.setTimeout","kind":"function","scope":"static","___id":"T000002R066219","___s":true,"options":[],"locus":"Anywhere"},"setInterval":{"meta":{"range":[1351,1467],"filename":"timers.js","lineno":39,"path":"/Users/dgreenspan/meteor/meteor/packages/meteor","code":{"id":"astnode100388323","name":"setInterval","type":"FunctionExpression","value":"function"}},"memberof":"Meteor","summary":"Call a function repeatedly, with a time delay between calls.","tags":[{"originalTitle":"locus","title":"locus","text":"Anywhere","value":"Anywhere"}],"params":[{"type":{"names":["function"]},"description":"The function to run
","name":"func"},{"type":{"names":["Number"]},"description":"Number of milliseconds to wait between each function call.
","name":"delay"}],"name":"setInterval","longname":"Meteor.setInterval","kind":"function","scope":"static","___id":"T000002R066220","___s":true,"options":[],"locus":"Anywhere"},"clearInterval":{"meta":{"range":[1677,1738],"filename":"timers.js","lineno":49,"path":"/Users/dgreenspan/meteor/meteor/packages/meteor","code":{"id":"astnode100388336","name":"clearInterval","type":"FunctionExpression","value":"function"}},"memberof":"Meteor","summary":"Cancel a repeating function call scheduled by `Meteor.setInterval`.","tags":[{"originalTitle":"locus","title":"locus","text":"Anywhere","value":"Anywhere"}],"params":[{"type":{"names":["Number"]},"description":"The handle returned by Meteor.setInterval
The handle returned by Meteor.setTimeout
A path to append to the root URL. Do not include a leading "/".
Create an HTTPS URL.
","name":"secure"},{"type":{"names":["Boolean"]},"description":"Replace localhost with 127.0.0.1. Useful for services that don't recognize localhost as a domain name.
","name":"replaceLocalhost"},{"type":{"names":["String"]},"description":"Override the default ROOT_URL from the server environment. For example: "http://foo.example.com"
Function to call. It will be called with three arguments: the document, a 0-based index, and cursor itself.
","name":"callback"},{"type":{"names":["Any"]},"optional":true,"description":"An object which will be the value of this inside callback.
Function to call. It will be called with three arguments: the document, a 0-based index, and cursor itself.
","name":"callback"},{"type":{"names":["Any"]},"optional":true,"description":"An object which will be the value of this inside callback.
Functions to call to deliver the result set as it changes
","name":"callbacks"}],"name":"observe","longname":"Meteor.Collection.Cursor#observe","kind":"function","___id":"T000002R066579","___s":true,"options":[],"locus":"Anywhere"},"Cursor#observeChanges":{"meta":{"range":[10538,14491],"filename":"minimongo.js","lineno":322,"path":"/Users/dgreenspan/meteor/meteor/packages/minimongo","code":{"id":"astnode100393444","name":"observeChanges","type":"FunctionExpression","value":"function"},"vars":{"self":null,"ordered":null,"query":null,"qid":null,"self.collection.queries[undefined]":null,"query.results":null,"query.resultsSnapshot":null,"wrapCallback":null,"":null,"query.added":null,"query.changed":null,"query.removed":null,"query.addedBefore":null,"query.movedBefore":null,"each":null,"handle":null}},"summary":"Watch a query. Receive callbacks as the result set changes. Only the differences between the old and new documents are passed to the callbacks.","tags":[{"originalTitle":"locus","title":"locus","text":"Anywhere","value":"Anywhere"}],"memberof":"Meteor.Collection.Cursor","scope":"instance","params":[{"type":{"names":["Object"]},"description":"Functions to call to deliver the result set as it changes
","name":"callbacks"}],"name":"observeChanges","longname":"Meteor.Collection.Cursor#observeChanges","kind":"function","___id":"T000002R066581","___s":true,"options":[],"locus":"Anywhere"},"Cursor":{"meta":{"range":[2780,2967],"filename":"minimongo.js","lineno":89,"path":"/Users/dgreenspan/meteor/meteor/packages/minimongo","code":{}},"summary":"To create a cursor, use find. To access the documents in a cursor, use forEach, map, or fetch.","kind":"class","name":"Cursor","memberof":"Meteor.Collection","tags":[{"originalTitle":"instanceName","title":"instancename","text":"cursor","value":"cursor"}],"scope":"static","longname":"Meteor.Collection.Cursor","___id":"T000002R066521","___s":true,"options":[],"params":[],"instancename":"cursor"},"meta":{"range":[1419,8435],"filename":"collection.js","lineno":20,"path":"/Users/dgreenspan/meteor/meteor/packages/mongo-livedata","code":{"id":"astnode100412011","name":"Meteor.Collection","type":"FunctionExpression","value":"function","paramnames":["name","options"]},"vars":{"self":null,"name":null,"options":null,"options.connection":null,"self._makeNewID":null,"":null,"self._transform":null,"self._connection":null,"options._driver":null,"self._collection":null,"self._name":null,"ok":null}},"summary":"Constructor for a Collection","tags":[{"originalTitle":"locus","title":"locus","text":"Anywhere","value":"Anywhere"},{"originalTitle":"instancename","title":"instancename","text":"collection","value":"collection"}],"kind":"class","params":[{"type":{"names":["String"]},"description":"The name of the collection. If null, creates an unmanaged (unsynchronized) local collection.
","name":"name"},{"type":{"names":["Object"]},"optional":true,"name":"options"}],"name":"Collection","longname":"Meteor.Collection","memberof":"Meteor","scope":"static","___id":"T000002R068400","___s":true,"options":[{"type":{"names":["Object"]},"description":"The server connection that will manage this collection. Uses the default connection if not specified. Pass the return value of calling DDP.connect to specify a different server. Pass null to specify no connection. Unmanaged (name is null) collections cannot specify a connection.
The method of generating the _id fields of new documents in this collection. Possible values:
- \n
'STRING': random strings \n'MONGO': randomMeteor.Collection.ObjectIDvalues \n
The default id generation technique is 'STRING'.
An optional transformation function. Documents will be passed through this function before being returned from fetch or findOne, and before being passed to callbacks of observe, map, forEach, allow, and deny. Transforms are not applied for the callbacks of observeChanges or to cursors returned from publish functions.
Optional. The 24-character hexadecimal contents of the ObjectID to create
","name":"hexString"}],"name":"ObjectID","longname":"Meteor.Collection.ObjectID","memberof":"Meteor.Collection","scope":"static","___id":"T000002R068525","___s":true,"options":[],"locus":"Anywhere"}},"Collection#insert":{"meta":{"range":[15926,16365],"filename":"collection.js","lineno":407,"path":"/Users/dgreenspan/meteor/meteor/packages/mongo-livedata","code":{}},"summary":"Insert a document in the collection. Returns its unique _id.","tags":[{"originalTitle":"locus","title":"locus","text":"Anywhere","value":"Anywhere"}],"kind":"function","name":"insert","memberof":"Meteor.Collection","scope":"instance","params":[{"type":{"names":["Object"]},"description":"The document to insert. May not yet have an _id attribute, in which case Meteor will generate one for you.
","name":"doc"},{"type":{"names":["function"]},"optional":true,"description":"Optional. If present, called with an error object as the first argument and, if no error, the _id as the second.
","name":"callback"}],"longname":"Meteor.Collection#insert","___id":"T000002R068398","___s":true,"options":[],"locus":"Anywhere"},"Collection#update":{"meta":{"range":[16367,17137],"filename":"collection.js","lineno":417,"path":"/Users/dgreenspan/meteor/meteor/packages/mongo-livedata","code":{}},"summary":"Modify one or more documents in the collection. Returns the number of affected documents.","tags":[{"originalTitle":"locus","title":"locus","text":"Anywhere","value":"Anywhere"}],"kind":"function","name":"update","memberof":"Meteor.Collection","scope":"instance","params":[{"type":{"names":["MongoSelector"]},"description":"Specifies which documents to modify
","name":"selector"},{"type":{"names":["MongoModifier"]},"description":"Specifies how to modify the documents
","name":"modifier"},{"type":{"names":["Object"]},"optional":true,"name":"options"},{"type":{"names":["function"]},"optional":true,"description":"Optional. If present, called with an error object as the first argument and, if no error, the number of affected documents as the second.
","name":"callback"}],"longname":"Meteor.Collection#update","___id":"T000002R068399","___s":true,"options":[{"type":{"names":["Boolean"]},"description":"True to modify all matching documents; false to only modify one of the matching documents (the default).
","name":"multi"},{"type":{"names":["Boolean"]},"description":"True to insert a document if no matching documents are found.
","name":"upsert"}],"locus":"Anywhere"},"Collection#find":{"meta":{"range":[9195,10059],"filename":"collection.js","lineno":245,"path":"/Users/dgreenspan/meteor/meteor/packages/mongo-livedata","code":{}},"summary":"Find the documents in a collection that match the selector.","tags":[{"originalTitle":"locus","title":"locus","text":"Anywhere","value":"Anywhere"}],"kind":"function","name":"find","memberof":"Meteor.Collection","scope":"instance","params":[{"type":{"names":["MongoSelector"]},"optional":true,"description":"A query describing the documents to find
","name":"selector"},{"type":{"names":["Object"]},"optional":true,"name":"options"}],"longname":"Meteor.Collection#find","___id":"T000002R068450","___s":true,"options":[{"type":{"names":["MongoSortSpecifier"]},"description":"Sort order (default: natural order)
","name":"sort"},{"type":{"names":["Number"]},"description":"Number of results to skip at the beginning
","name":"skip"},{"type":{"names":["Number"]},"description":"Maximum number of results to return
","name":"limit"},{"type":{"names":["MongoFieldSpecifier"]},"description":"Dictionary of fields to return or exclude.
","name":"fields"},{"type":{"names":["Boolean"]},"description":"(Client only) Default true; pass false to disable reactivity
Overrides transform on the Collection for this cursor. Pass null to disable transformation.
A query describing the documents to find
","name":"selector"},{"type":{"names":["Object"]},"optional":true,"name":"options"}],"longname":"Meteor.Collection#findOne","___id":"T000002R068454","___s":true,"options":[{"type":{"names":["MongoSortSpecifier"]},"description":"Sort order (default: natural order)
","name":"sort"},{"type":{"names":["Number"]},"description":"Number of results to skip at the beginning
","name":"skip"},{"type":{"names":["MongoFieldSpecifier"]},"description":"Dictionary of fields to return or exclude.
","name":"fields"},{"type":{"names":["Boolean"]},"description":"(Client only) Default true; pass false to disable reactivity
","name":"reactive"},{"type":{"names":["function"]},"description":"Overrides transform on the Collection for this cursor. Pass null to disable transformation.
Specifies which documents to remove
","name":"selector"},{"type":{"names":["function"]},"optional":true,"description":"Optional. If present, called with an error object as its argument.
","name":"callback"}],"longname":"Meteor.Collection#remove","___id":"T000002R068481","___s":true,"options":[],"locus":"Anywhere"},"Collection#upsert":{"meta":{"range":[23713,24109],"filename":"collection.js","lineno":593,"path":"/Users/dgreenspan/meteor/meteor/packages/mongo-livedata","code":{"id":"astnode100413615","name":"Meteor.Collection.prototype.upsert","type":"FunctionExpression","value":"function","paramnames":["selector","modifier","options","callback"]},"vars":{"self":null,"callback":null,"options":null}},"summary":"Modify one or more documents in the collection, or insert one if no matching documents were found. Returns an object with keys `numberAffected` (the number of documents modified) and `insertedId` (the unique _id of the document that was inserted, if any).","tags":[{"originalTitle":"locus","title":"locus","text":"Anywhere","value":"Anywhere"}],"params":[{"type":{"names":["MongoSelector"]},"description":"Specifies which documents to modify
","name":"selector"},{"type":{"names":["MongoModifier"]},"description":"Specifies how to modify the documents
","name":"modifier"},{"type":{"names":["Object"]},"optional":true,"name":"options"},{"type":{"names":["function"]},"optional":true,"description":"Optional. If present, called with an error object as the first argument and, if no error, the number of affected documents as the second.
","name":"callback"}],"name":"upsert","longname":"Meteor.Collection#upsert","kind":"function","memberof":"Meteor.Collection","scope":"instance","___id":"T000002R068511","___s":true,"options":[{"type":{"names":["Boolean"]},"description":"True to modify all matching documents; false to only modify one of the matching documents (the default).
","name":"multi"}],"locus":"Anywhere"},"Collection#allow":{"meta":{"range":[29204,29310],"filename":"collection.js","lineno":727,"path":"/Users/dgreenspan/meteor/meteor/packages/mongo-livedata","code":{"id":"astnode100413999","name":"Meteor.Collection.prototype.allow","type":"FunctionExpression","value":"function","paramnames":["options"]}},"summary":"Allow users to write directly to this collection from client code, subject to limitations you define.","tags":[{"originalTitle":"locus","title":"locus","text":"Server","value":"Server"}],"params":[{"type":{"names":["Object"]},"name":"options"}],"name":"allow","longname":"Meteor.Collection#allow","kind":"function","memberof":"Meteor.Collection","scope":"instance","___id":"T000002R068532","___s":true,"options":[{"type":{"names":["function"]},"name":"insert"},{"type":{"names":["function"]},"name":"update"},{"type":{"names":["function"]},"description":"Functions that look at a proposed modification to the database and return true if it should be allowed.
","name":"remove"},{"type":{"names":["Array.Optional performance enhancement. Limits the fields that will be fetched from the database for inspection by your update and remove functions.
Overrides transform on the Collection. Pass null to disable transformation.
Functions that look at a proposed modification to the database and return true if it should be denied, even if an allow rule says otherwise.
Optional performance enhancement. Limits the fields that will be fetched from the database for inspection by your update and remove functions.
Overrides transform on the Collection. Pass null to disable transformation.
A numeric error code, likely similar to an HTTP code (eg, 404, 500).
","name":"error"},{"type":{"names":["String"]},"optional":true,"description":"Optional. A short human-readable summary of the error, like 'Not Found'.
","name":"reason"},{"type":{"names":["String"]},"optional":true,"description":"Optional. Additional information about the error, like a textual stack trace.
","name":"details"}],"name":"Error","longname":"Meteor.Error","memberof":"Meteor","scope":"static","___id":"T000002R065930","___s":true,"options":[],"locus":"Anywhere"}},"MethodInvocation#isSimulation":{"comment":"/**\n * @summary Access inside a method invocation. Boolean value, true if this invocation is a stub.\n * @locus Anywhere\n * @name isSimulation\n * @memberOf MethodInvocation\n * @instance\n */","meta":{"range":[895,1097],"filename":"livedata_common.js","lineno":24,"path":"/Users/dgreenspan/meteor/meteor/packages/livedata","code":{}},"summary":"Access inside a method invocation. Boolean value, true if this invocation is a stub.","tags":[{"originalTitle":"locus","title":"locus","text":"Anywhere","value":"Anywhere"}],"name":"isSimulation","memberof":"MethodInvocation","scope":"instance","longname":"MethodInvocation#isSimulation","kind":"member","___id":"T000002R063084","___s":true,"locus":"Anywhere"},"MethodInvocation#userId":{"comment":"/**\n * @summary The id of the user that made this method call, or `null` if no user was logged in.\n * @locus Anywhere\n * @name userId\n * @memberOf MethodInvocation\n * @instance\n */","meta":{"range":[1407,1600],"filename":"livedata_common.js","lineno":41,"path":"/Users/dgreenspan/meteor/meteor/packages/livedata","code":{}},"summary":"The id of the user that made this method call, or `null` if no user was logged in.","tags":[{"originalTitle":"locus","title":"locus","text":"Anywhere","value":"Anywhere"}],"name":"userId","memberof":"MethodInvocation","scope":"instance","longname":"MethodInvocation#userId","kind":"member","___id":"T000002R063088","___s":true,"locus":"Anywhere"},"MethodInvocation#connection":{"comment":"/**\n * @summary Access inside a method invocation. The [connection](#meteor_onconnection) that this method was received on. `null` if the method is not associated with a connection, eg. a server initiated method call.\n * @locus Server\n * @name connection\n * @memberOf MethodInvocation\n * @instance\n */","meta":{"range":[1852,2166],"filename":"livedata_common.js","lineno":56,"path":"/Users/dgreenspan/meteor/meteor/packages/livedata","code":{}},"summary":"Access inside a method invocation. The [connection](#meteor_onconnection) that this method was received on. `null` if the method is not associated with a connection, eg. a server initiated method call.","tags":[{"originalTitle":"locus","title":"locus","text":"Server","value":"Server"}],"name":"connection","memberof":"MethodInvocation","scope":"instance","longname":"MethodInvocation#connection","kind":"member","___id":"T000002R063091","___s":true,"locus":"Server"},"Subscription#connection":{"comment":"/**\n * @summary Access inside the publish function. The incoming [connection](#meteor_onconnection) for this subscription.\n * @locus Server\n * @name connection\n * @memberOf Subscription\n * @instance\n */","meta":{"range":[27477,27692],"filename":"livedata_server.js","lineno":863,"path":"/Users/dgreenspan/meteor/meteor/packages/livedata","code":{}},"summary":"Access inside the publish function. The incoming [connection](#meteor_onconnection) for this subscription.","tags":[{"originalTitle":"locus","title":"locus","text":"Server","value":"Server"}],"name":"connection","memberof":"Subscription","scope":"instance","longname":"Subscription#connection","kind":"member","___id":"T000002R064588","___s":true,"locus":"Server"},"Subscription#userId":{"comment":"/**\n * @summary Access inside the publish function. The id of the logged-in user, or `null` if no user is logged in.\n * @locus Server\n * @memberOf Subscription\n * @name userId\n * @instance\n */","meta":{"range":[28731,28936],"filename":"livedata_server.js","lineno":905,"path":"/Users/dgreenspan/meteor/meteor/packages/livedata","code":{}},"summary":"Access inside the publish function. The id of the logged-in user, or `null` if no user is logged in.","tags":[{"originalTitle":"locus","title":"locus","text":"Server","value":"Server"}],"memberof":"Subscription","name":"userId","scope":"instance","longname":"Subscription#userId","kind":"member","___id":"T000002R064600","___s":true,"locus":"Server"},"Tracker":{"active":{"comment":"/**\n * @summary True if there is a current computation, meaning that dependencies on reactive data sources will be tracked and potentially cause the current computation to be rerun.\n * @locus Client\n */","meta":{"range":[418,440],"filename":"tracker.js","lineno":13,"path":"/Users/dgreenspan/meteor/meteor/packages/tracker","code":{"id":"astnode100506995","name":"Tracker.active","type":"Literal","value":"false","paramnames":[]}},"summary":"True if there is a current computation, meaning that dependencies on reactive data sources will be tracked and potentially cause the current computation to be rerun.","tags":[{"originalTitle":"locus","title":"locus","text":"Client","value":"Client"}],"name":"active","longname":"Tracker.active","kind":"member","memberof":"Tracker","scope":"static","___id":"T000002R076192","___s":true,"locus":"Client"},"currentComputation":{"comment":"/**\n * @summary The current computation, or `null` if there isn't one. The current computation is the [`Tracker.Computation`](#tracker_computation) object created by the innermost active call to `Tracker.autorun`, and it's the computation that gains dependencies when reactive data sources are accessed.\n * @locus Client\n */","meta":{"range":[824,857],"filename":"tracker.js","lineno":21,"path":"/Users/dgreenspan/meteor/meteor/packages/tracker","code":{"id":"astnode100507001","name":"Tracker.currentComputation","type":"Literal","value":"null","paramnames":[]}},"summary":"The current computation, or `null` if there isn't one. The current computation is the [`Tracker.Computation`](#tracker_computation) object created by the innermost active call to `Tracker.autorun`, and it's the computation that gains dependencies when reactive data sources are accessed.","tags":[{"originalTitle":"locus","title":"locus","text":"Client","value":"Client"}],"name":"currentComputation","longname":"Tracker.currentComputation","kind":"member","memberof":"Tracker","scope":"static","___id":"T000002R076193","___s":true,"locus":"Client"},"Computation#stopped":{"comment":"/**\n * @summary True if this computation has been stopped.\n * @locus Client\n * @memberOf Tracker.Computation\n * @instance\n * @name stopped\n */","meta":{"range":[4547,4702],"filename":"tracker.js","lineno":132,"path":"/Users/dgreenspan/meteor/meteor/packages/tracker","code":{}},"summary":"True if this computation has been stopped.","tags":[{"originalTitle":"locus","title":"locus","text":"Client","value":"Client"}],"memberof":"Tracker.Computation","scope":"instance","name":"stopped","longname":"Tracker.Computation#stopped","kind":"member","___id":"T000002R076219","___s":true,"locus":"Client"},"Computation#invalidated":{"comment":"/**\n * @summary True if this computation has been invalidated (and not yet rerun), or if it has been stopped.\n * @locus Client\n * @memberOf Tracker.Computation\n * @instance\n * @name invalidated\n */","meta":{"range":[4784,4994],"filename":"tracker.js","lineno":143,"path":"/Users/dgreenspan/meteor/meteor/packages/tracker","code":{}},"summary":"True if this computation has been invalidated (and not yet rerun), or if it has been stopped.","tags":[{"originalTitle":"locus","title":"locus","text":"Client","value":"Client"}],"memberof":"Tracker.Computation","scope":"instance","name":"invalidated","longname":"Tracker.Computation#invalidated","kind":"member","___id":"T000002R076221","___s":true,"locus":"Client"},"Computation#firstRun":{"comment":"/**\n * @summary True during the initial run of the computation at the time `Tracker.autorun` is called, and false on subsequent reruns and at other times.\n * @locus Client\n * @memberOf Tracker.Computation\n * @instance\n * @name firstRun\n */","meta":{"range":[5077,5329],"filename":"tracker.js","lineno":154,"path":"/Users/dgreenspan/meteor/meteor/packages/tracker","code":{}},"summary":"True during the initial run of the computation at the time `Tracker.autorun` is called, and false on subsequent reruns and at other times.","tags":[{"originalTitle":"locus","title":"locus","text":"Client","value":"Client"}],"memberof":"Tracker.Computation","scope":"instance","name":"firstRun","longname":"Tracker.Computation#firstRun","kind":"member","___id":"T000002R076223","___s":true,"locus":"Client"},"Computation":{"meta":{"range":[4266,5759],"filename":"tracker.js","lineno":122,"path":"/Users/dgreenspan/meteor/meteor/packages/tracker","code":{"id":"astnode100507250","name":"Tracker.Computation","type":"FunctionExpression","value":"function","paramnames":["f","parent"]},"vars":{"constructingComputation":null,"self":null,"self.stopped":null,"self.invalidated":null,"self.firstRun":null,"self._id":null,"self._onInvalidateCallbacks":null,"self._parent":null,"self._func":null,"self._recomputing":null,"errored":null}},"summary":"A Computation object represents code that is repeatedly rerun\nin response to\nreactive data changes. Computations don't have return values; they just\nperform actions, such as rerendering a template on the screen. Computations\nare created using Tracker.autorun. Use stop to prevent further rerunning of a\ncomputation.","tags":[{"originalTitle":"instancename","title":"instancename","text":"computation","value":"computation"}],"name":"Computation","longname":"Tracker.Computation","kind":"function","memberof":"Tracker","scope":"static","___id":"T000002R076216","___s":true,"options":[],"params":[],"instancename":"computation"},"Computation#onInvalidate":{"meta":{"range":[6268,6602],"filename":"tracker.js","lineno":189,"path":"/Users/dgreenspan/meteor/meteor/packages/tracker","code":{"id":"astnode100507352","name":"Tracker.Computation.prototype.onInvalidate","type":"FunctionExpression","value":"function","paramnames":["f"]},"vars":{"self":null,"":null}},"summary":"Registers `callback` to run when this computation is next invalidated, or runs it immediately if the computation is already invalidated. The callback is run exactly once and not upon future invalidations unless `onInvalidate` is called again after the computation becomes valid again.","tags":[{"originalTitle":"locus","title":"locus","text":"Client","value":"Client"}],"params":[{"type":{"names":["function"]},"description":"Function to be called on invalidation. Receives one argument, the computation that was invalidated.
","name":"callback"}],"name":"onInvalidate","longname":"Tracker.Computation#onInvalidate","kind":"function","memberof":"Tracker.Computation","scope":"instance","___id":"T000002R076233","___s":true,"options":[],"locus":"Client"},"Computation#invalidate":{"meta":{"range":[6748,7393],"filename":"tracker.js","lineno":210,"path":"/Users/dgreenspan/meteor/meteor/packages/tracker","code":{"id":"astnode100507404","name":"Tracker.Computation.prototype.invalidate","type":"FunctionExpression","value":"function","paramnames":[]},"vars":{"self":null,"self.invalidated":null,"i":null,"f":null,"":null,"self._onInvalidateCallbacks":null}},"summary":"Invalidates this computation so that it will be rerun.","tags":[{"originalTitle":"locus","title":"locus","text":"Client","value":"Client"}],"name":"invalidate","longname":"Tracker.Computation#invalidate","kind":"function","memberof":"Tracker.Computation","scope":"instance","___id":"T000002R076235","___s":true,"options":[],"params":[],"locus":"Client"},"Computation#stop":{"meta":{"range":[7520,7648],"filename":"tracker.js","lineno":239,"path":"/Users/dgreenspan/meteor/meteor/packages/tracker","code":{"id":"astnode100507487","name":"Tracker.Computation.prototype.stop","type":"FunctionExpression","value":"function","paramnames":[]},"vars":{"this.stopped":null}},"summary":"Prevents this computation from rerunning.","tags":[{"originalTitle":"locus","title":"locus","text":"Client","value":"Client"}],"name":"stop","longname":"Tracker.Computation#stop","kind":"function","memberof":"Tracker.Computation","scope":"instance","___id":"T000002R076242","___s":true,"options":[],"params":[],"locus":"Client"},"Dependency#depend":{"meta":{"range":[9967,10409],"filename":"tracker.js","lineno":317,"path":"/Users/dgreenspan/meteor/meteor/packages/tracker","code":{"id":"astnode100507639","name":"Tracker.Dependency.prototype.depend","type":"FunctionExpression","value":"function","paramnames":["computation"]},"vars":{"computation":null,"self":null,"id":null,"self._dependentsById[undefined]":null,"":null}},"summary":"Declares that the current computation (or `fromComputation` if given) depends on `dependency`. The computation will be invalidated the next time `dependency` changes.\n\nIf there is no current computation and `depend()` is called with no arguments, it does nothing and returns false.\n\nReturns true if the computation is a new dependent of `dependency` rather than an existing one.","tags":[{"originalTitle":"locus","title":"locus","text":"Client","value":"Client"}],"params":[{"type":{"names":["Tracker.Computation"]},"optional":true,"description":"An optional computation declared to depend on dependency instead of the current computation.
The function to run. It receives one argument: the Computation object that will be returned.
","name":"runFunc"}],"name":"autorun","longname":"Tracker.autorun","kind":"function","memberof":"Tracker","scope":"static","___id":"T000002R076280","___s":true,"options":[],"locus":"Client"},"nonreactive":{"meta":{"range":[14340,14533],"filename":"tracker.js","lineno":465,"path":"/Users/dgreenspan/meteor/meteor/packages/tracker","code":{"id":"astnode100507941","name":"Tracker.nonreactive","type":"FunctionExpression","value":"function","paramnames":["f"]},"vars":{"previous":null}},"summary":"Run a function without tracking dependencies.","tags":[{"originalTitle":"locus","title":"locus","text":"Client","value":"Client"}],"params":[{"type":{"names":["function"]},"description":"A function to call immediately.
","name":"func"}],"name":"nonreactive","longname":"Tracker.nonreactive","kind":"function","memberof":"Tracker","scope":"static","___id":"T000002R076283","___s":true,"options":[],"locus":"Client"},"onInvalidate":{"meta":{"range":[14970,15155],"filename":"tracker.js","lineno":482,"path":"/Users/dgreenspan/meteor/meteor/packages/tracker","code":{"id":"astnode100507969","name":"Tracker.onInvalidate","type":"FunctionExpression","value":"function","paramnames":["f"]}},"summary":"Registers a new [`onInvalidate`](#computation_oninvalidate) callback on the current computation (which must exist), to be called immediately when the current computation is invalidated or stopped.","tags":[{"originalTitle":"locus","title":"locus","text":"Client","value":"Client"}],"params":[{"type":{"names":["function"]},"description":"A callback function that will be invoked as func(c), where c is the computation on which the callback is registered.
A function to call at flush time.
","name":"callback"}],"name":"afterFlush","longname":"Tracker.afterFlush","kind":"function","memberof":"Tracker","scope":"static","___id":"T000002R076286","___s":true,"options":[],"locus":"Client"},"Dependency":{"meta":{"range":[9057,9122],"filename":"tracker.js","lineno":297,"path":"/Users/dgreenspan/meteor/meteor/packages/tracker","code":{"id":"astnode100507626","name":"Tracker.Dependency","type":"FunctionExpression","value":"function","paramnames":[]},"vars":{"this._dependentsById":null}},"summary":"A Dependency represents an atomic unit of reactive data that a\ncomputation might depend on. Reactive data sources such as Session or\nMinimongo internally create different Dependency objects for different\npieces of data, each of which may be depended on by multiple computations.\nWhen the data changes, the computations are invalidated.","kind":"class","tags":[{"originalTitle":"instanceName","title":"instancename","text":"dependency","value":"dependency"}],"name":"Dependency","longname":"Tracker.Dependency","memberof":"Tracker","scope":"static","___id":"T000002R076255","___s":true,"options":[],"params":[],"instancename":"dependency"}},"EJSON":{"newBinary":{"meta":{"range":[1470,1769],"filename":"base64.js","lineno":70,"path":"/Users/dgreenspan/meteor/meteor/packages/ejson","code":{"id":"astnode100271811","name":"EJSON.newBinary","type":"FunctionExpression","value":"function","paramnames":["len"]},"vars":{"ret":null,"i":null,"ret.$Uint8ArrayPolyfill":null}},"summary":"Allocate a new buffer of binary data that EJSON can serialize.","tags":[{"originalTitle":"locus","title":"locus","text":"Anywhere","value":"Anywhere"}],"params":[{"type":{"names":["Number"]},"description":"The number of bytes of binary data to allocate.
","name":"size"}],"name":"newBinary","longname":"EJSON.newBinary","kind":"function","memberof":"EJSON","scope":"static","___id":"T000002R051022","___s":true,"options":[],"locus":"Anywhere"},"addType":{"meta":{"range":[1156,1321],"filename":"ejson.js","lineno":24,"path":"/Users/dgreenspan/meteor/meteor/packages/ejson","code":{"id":"astnode100272661","name":"EJSON.addType","type":"FunctionExpression","value":"function","paramnames":["name","factory"]},"vars":{"customTypes[undefined]":null}},"summary":"Add a custom datatype to EJSON.","tags":[{"originalTitle":"locus","title":"locus","text":"Anywhere","value":"Anywhere"}],"params":[{"type":{"names":["String"]},"description":"A tag for your custom type; must be unique among custom data types defined in your project, and must match the result of your type's typeName method.
A function that deserializes a JSON-compatible value into an instance of your type. This should match the serialization performed by your type's toJSONValue method.
A value to serialize to plain JSON.
","name":"val"}],"name":"toJSONValue","longname":"EJSON.toJSONValue","kind":"function","memberof":"EJSON","scope":"static","___id":"T000002R051153","___s":true,"options":[],"locus":"Anywhere"},"fromJSONValue":{"meta":{"range":[7910,8166],"filename":"ejson.js","lineno":262,"path":"/Users/dgreenspan/meteor/meteor/packages/ejson","code":{"id":"astnode100273476","name":"EJSON.fromJSONValue","type":"FunctionExpression","value":"function","paramnames":["item"]},"vars":{"changed":null,"item":null}},"summary":"Deserialize an EJSON value from its plain JSON representation.","tags":[{"originalTitle":"locus","title":"locus","text":"Anywhere","value":"Anywhere"}],"params":[{"type":{"names":["JSONCompatible"]},"description":"A value to deserialize into EJSON.
","name":"val"}],"name":"fromJSONValue","longname":"EJSON.fromJSONValue","kind":"function","memberof":"EJSON","scope":"static","___id":"T000002R051164","___s":true,"options":[],"locus":"Anywhere"},"stringify":{"meta":{"range":[8794,9037],"filename":"ejson.js","lineno":283,"path":"/Users/dgreenspan/meteor/meteor/packages/ejson","code":{"id":"astnode100273517","name":"EJSON.stringify","type":"FunctionExpression","value":"function","paramnames":["item","options"]},"vars":{"json":null}},"summary":"Serialize a value to a string.\n\nFor EJSON values, the serialization fully represents the value. For non-EJSON values, serializes the same way as `JSON.stringify`.","tags":[{"originalTitle":"locus","title":"locus","text":"Anywhere","value":"Anywhere"}],"params":[{"type":{"names":["EJSON"]},"description":"A value to stringify.
","name":"val"},{"type":{"names":["Object"]},"optional":true,"name":"options"}],"name":"stringify","longname":"EJSON.stringify","kind":"function","memberof":"EJSON","scope":"static","___id":"T000002R051167","___s":true,"options":[{"type":{"names":["Boolean","Integer","String"]},"description":"Indents objects and arrays for easy readability. When true, indents by 2 spaces; when an integer, indents by that number of spaces; and when a string, uses the string as the indentation pattern.
When true, stringifies keys in an object in sorted order.
A string to parse into an EJSON value.
","name":"str"}],"name":"parse","longname":"EJSON.parse","kind":"function","memberof":"EJSON","scope":"static","___id":"T000002R051169","___s":true,"options":[],"locus":"Anywhere"},"isBinary":{"meta":{"range":[9595,9749],"filename":"ejson.js","lineno":308,"path":"/Users/dgreenspan/meteor/meteor/packages/ejson","code":{"id":"astnode100273586","name":"EJSON.isBinary","type":"FunctionExpression","value":"function","paramnames":["obj"]}},"summary":"Returns true if `x` is a buffer of binary data, as returned from [`EJSON.newBinary`](#ejson_new_binary).","params":[{"type":{"names":["Object"]},"description":"The variable to check.
","name":"x"}],"tags":[{"originalTitle":"locus","title":"locus","text":"Anywhere","value":"Anywhere"}],"name":"isBinary","longname":"EJSON.isBinary","kind":"function","memberof":"EJSON","scope":"static","___id":"T000002R051170","___s":true,"options":[],"locus":"Anywhere"},"equals":{"meta":{"range":[10268,12522],"filename":"ejson.js","lineno":321,"path":"/Users/dgreenspan/meteor/meteor/packages/ejson","code":{"id":"astnode100273611","name":"EJSON.equals","type":"FunctionExpression","value":"function","paramnames":["a","b","options"]},"vars":{"i":null,"keyOrderSensitive":null,"ret":null,"bKeys":null,"":null}},"summary":"Return true if `a` and `b` are equal to each other. Return false otherwise. Uses the `equals` method on `a` if present, otherwise performs a deep comparison.","tags":[{"originalTitle":"locus","title":"locus","text":"Anywhere","value":"Anywhere"}],"params":[{"type":{"names":["EJSON"]},"name":"a"},{"type":{"names":["EJSON"]},"name":"b"},{"type":{"names":["Object"]},"optional":true,"name":"options"}],"name":"equals","longname":"EJSON.equals","kind":"function","memberof":"EJSON","scope":"static","___id":"T000002R051171","___s":true,"options":[{"type":{"names":["Boolean"]},"description":"Compare in key sensitive order, if supported by the JavaScript implementation. For example, {a: 1, b: 2} is equal to {b: 2, a: 1} only when keyOrderSensitive is false. The default is false.
A value to copy.
","name":"val"}],"name":"clone","longname":"EJSON.clone","kind":"function","memberof":"EJSON","scope":"static","___id":"T000002R051182","___s":true,"options":[],"locus":"Anywhere"}},"HTTP":{"call":{"meta":{"range":[1471,6304],"filename":"httpcall_client.js","lineno":17,"path":"/Users/dgreenspan/meteor/meteor/packages/http","code":{"id":"astnode100310354","name":"HTTP.call","type":"FunctionExpression","value":"function","paramnames":["method","url","options","callback"]},"vars":{"callback":null,"options":null,"method":null,"headers":null,"content":null,"headers['Content-Type']":null,"params_for_url":null,"params_for_body":null,"query_match":null,"url":null,"username":null,"password":null,"colonLoc":null,"":null,"xhr":null,"k":null,"timed_out":null,"timer":null,"xhr.onreadystatechange":null}},"summary":"Perform an outbound HTTP request.","tags":[{"originalTitle":"locus","title":"locus","text":"Anywhere","value":"Anywhere"}],"params":[{"type":{"names":["String"]},"description":"The HTTP method to use, such as "GET", "POST", or "HEAD".
The URL to retrieve.
","name":"url"},{"type":{"names":["Object"]},"optional":true,"name":"options"},{"type":{"names":["function"]},"optional":true,"description":"Optional callback. If passed, the method runs asynchronously, instead of synchronously, and calls asyncCallback. On the client, this callback is required.
","name":"asyncCallback"}],"name":"call","longname":"HTTP.call","kind":"function","memberof":"HTTP","scope":"static","___id":"T000002R059617","___s":true,"options":[{"type":{"names":["String"]},"description":"String to use as the HTTP request body.
","name":"content"},{"type":{"names":["Object"]},"description":"JSON-able object to stringify and use as the HTTP request body. Overwrites content.
Query string to go in the URL. Overwrites any query string in url.
Dictionary of request parameters to be encoded and placed in the URL (for GETs) or request body (for POSTs). If content or data is specified, params will always be placed in the URL.
HTTP basic authentication string of the form "username:password"
Dictionary of strings, headers to add to the HTTP request.
","name":"headers"},{"type":{"names":["Number"]},"description":"Maximum time in milliseconds to wait for the request before failing. There is no timeout by default.
","name":"timeout"},{"type":{"names":["Boolean"]},"description":"If true, transparently follow HTTP redirects. Cannot be set to false on the client. Default true.
The value that should be returned by userId on this connection.
The URL of another Meteor application.
","name":"url"}],"name":"connect","longname":"DDP.connect","kind":"function","memberof":"DDP","scope":"static","___id":"T000002R063453","___s":true,"options":[],"locus":"Anywhere"}},"Subscription#error":{"meta":{"range":[35098,35259],"filename":"livedata_server.js","lineno":1074,"path":"/Users/dgreenspan/meteor/meteor/packages/livedata","code":{"id":"astnode100367727","name":"error","type":"FunctionExpression","value":"function"},"vars":{"self":null}},"summary":"Call inside the publish function. Stops this client's subscription, triggering a call on the client to the `onError` callback passed to [`Meteor.subscribe`](#meteor_subscribe), if any. If `error` is not a [`Meteor.Error`](#meteor_error), it will be [sanitized](#meteor_error).","tags":[{"originalTitle":"locus","title":"locus","text":"Server","value":"Server"}],"params":[{"type":{"names":["Error"]},"description":"The error to pass to the client.
","name":"error"}],"scope":"instance","memberof":"Subscription","name":"error","longname":"Subscription#error","kind":"function","___id":"T000002R064624","___s":true,"options":[],"locus":"Server"},"Subscription#stop":{"meta":{"range":[35755,35903],"filename":"livedata_server.js","lineno":1092,"path":"/Users/dgreenspan/meteor/meteor/packages/livedata","code":{"id":"astnode100367752","name":"stop","type":"FunctionExpression","value":"function"},"vars":{"self":null}},"summary":"Call inside the publish function. Stops this client's subscription; the `onError` callback is *not* invoked on the client.","tags":[{"originalTitle":"locus","title":"locus","text":"Server","value":"Server"}],"scope":"instance","memberof":"Subscription","name":"stop","longname":"Subscription#stop","kind":"function","___id":"T000002R064626","___s":true,"options":[],"params":[],"locus":"Server"},"Subscription#onStop":{"meta":{"range":[36152,36306],"filename":"livedata_server.js","lineno":1106,"path":"/Users/dgreenspan/meteor/meteor/packages/livedata","code":{"id":"astnode100367775","name":"onStop","type":"FunctionExpression","value":"function"},"vars":{"self":null}},"summary":"Call inside the publish function. Registers a callback function to run when the subscription is stopped.","tags":[{"originalTitle":"locus","title":"locus","text":"Server","value":"Server"}],"memberof":"Subscription","scope":"instance","params":[{"type":{"names":["function"]},"description":"The callback function
","name":"func"}],"name":"onStop","longname":"Subscription#onStop","kind":"function","___id":"T000002R064628","___s":true,"options":[],"locus":"Server"},"Subscription#added":{"meta":{"range":[37038,37338],"filename":"livedata_server.js","lineno":1131,"path":"/Users/dgreenspan/meteor/meteor/packages/livedata","code":{"id":"astnode100367818","name":"added","type":"FunctionExpression","value":"function"},"vars":{"self":null,"id":null,"[undefined]":null}},"summary":"Call inside the publish function. Informs the subscriber that a document has been added to the record set.","tags":[{"originalTitle":"locus","title":"locus","text":"Server","value":"Server"}],"memberof":"Subscription","scope":"instance","params":[{"type":{"names":["String"]},"description":"The name of the collection that contains the new document.
","name":"collection"},{"type":{"names":["String"]},"description":"The new document's ID.
","name":"id"},{"type":{"names":["Object"]},"description":"The fields in the new document. If _id is present it is ignored.
The name of the collection that contains the changed document.
","name":"collection"},{"type":{"names":["String"]},"description":"The changed document's ID.
","name":"id"},{"type":{"names":["Object"]},"description":"The fields in the document that have changed, together with their new values. If a field is not present in fields it was left unchanged; if it is present in fields and has a value of undefined it was removed from the document. If _id is present it is ignored.
The name of the collection that the document has been removed from.
","name":"collection"},{"type":{"names":["String"]},"description":"The ID of the document that has been removed.
","name":"id"}],"name":"removed","longname":"Subscription#removed","kind":"function","___id":"T000002R064639","___s":true,"options":[],"locus":"Server"},"Subscription#ready":{"meta":{"range":[39354,39646],"filename":"livedata_server.js","lineno":1182,"path":"/Users/dgreenspan/meteor/meteor/packages/livedata","code":{"id":"astnode100367955","name":"ready","type":"FunctionExpression","value":"function"},"vars":{"self":null,"self._ready":null}},"summary":"Call inside the publish function. Informs the subscriber that an initial, complete snapshot of the record set has been sent. This will trigger a call on the client to the `onReady` callback passed to [`Meteor.subscribe`](#meteor_subscribe), if any.","tags":[{"originalTitle":"locus","title":"locus","text":"Server","value":"Server"}],"memberof":"Subscription","scope":"instance","name":"ready","longname":"Subscription#ready","kind":"function","___id":"T000002R064642","___s":true,"options":[],"params":[],"locus":"Server"},"Session":{"set":{"meta":{"range":[293,713],"filename":"session.js","lineno":12,"path":"/Users/dgreenspan/meteor/meteor/packages/session","code":{}},"memberof":"Session","kind":"function","name":"set","summary":"Set a variable in the session. Notify any listeners that the value has changed (eg: redraw templates, and rerun any [`Tracker.autorun`](#tracker_autorun) computations, that called [`Session.get`](#session_get) on this `key`.)","tags":[{"originalTitle":"locus","title":"locus","text":"Client","value":"Client"}],"params":[{"type":{"names":["String"]},"description":"The key to set, eg, selectedItem
The new value for key
The key to set, eg, selectedItem
The new value for key
The name of the session variable to return
","name":"key"}],"scope":"static","longname":"Session.get","___id":"T000002R072602","___s":true,"options":[],"locus":"Client"},"equals":{"meta":{"range":[1528,1937],"filename":"session.js","lineno":38,"path":"/Users/dgreenspan/meteor/meteor/packages/session","code":{}},"memberof":"Session","kind":"function","name":"equals","summary":"Test if a session variable is equal to a value. If inside a [reactive computation](#reactivity), invalidate the computation the next time the variable changes to or from the value.","tags":[{"originalTitle":"locus","title":"locus","text":"Client","value":"Client"}],"params":[{"type":{"names":["String"]},"description":"The name of the session variable to test
","name":"key"},{"type":{"names":["String","Number","Boolean","null","undefined"]},"description":"The value to test against
","name":"value"}],"scope":"static","longname":"Session.equals","___id":"T000002R072606","___s":true,"options":[],"locus":"Client"}},"Subscription":{"meta":{"range":[27224,27324],"filename":"livedata_server.js","lineno":853,"path":"/Users/dgreenspan/meteor/meteor/packages/livedata","code":{}},"summary":"The server's side of a subscription","kind":"class","name":"Subscription","tags":[{"originalTitle":"instanceName","title":"instancename","text":"this","value":"this"}],"longname":"Subscription","___id":"T000002R064584","___s":true,"options":[],"params":[],"instancename":"this"}}; \ No newline at end of file +DocsData = {"Accounts":{"comment":"/**\n * @namespace Accounts\n * @summary The namespace for all accounts-related methods.\n */","meta":{"range":[0,90],"filename":"accounts_common.js","lineno":1,"path":"/Users/sashko/git/meteor/packages/accounts-base","code":{}},"kind":"namespace","name":"Accounts","summary":"The namespace for all accounts-related methods.","longname":"Accounts","___id":"T000002R000046","___s":true,"ui":{"comment":"/**\n * @summary Accounts UI\n * @namespace\n * @memberOf Accounts\n */","meta":{"range":[68,84],"filename":"accounts_ui.js","lineno":6,"path":"/Users/sashko/git/meteor/packages/accounts-ui-unstyled","code":{"id":"astnode100017011","name":"Accounts.ui","type":"ObjectExpression","value":"{}","paramnames":[]}},"summary":"Accounts UI","kind":"namespace","memberof":"Accounts","name":"ui","longname":"Accounts.ui","scope":"static","___id":"T000002R001212","___s":true,"config":{"meta":{"range":[1184,3840],"filename":"accounts_ui.js","lineno":25,"path":"/Users/sashko/git/meteor/packages/accounts-ui-unstyled","code":{"id":"astnode100017031","name":"Accounts.ui.config","type":"FunctionExpression","value":"function","paramnames":["options"]},"vars":{"VALID_KEYS":null,"":null,"Accounts.ui._options.passwordSignupFields":null}},"summary":"Configure the behavior of [`{{> loginButtons}}`](#accountsui).","tags":[{"originalTitle":"locus","title":"locus","text":"Client","value":"Client"}],"params":[{"type":{"names":["Object"]},"name":"options"}],"name":"config","longname":"Accounts.ui.config","kind":"function","memberof":"Accounts.ui","scope":"static","___id":"T000002R001217","___s":true,"options":[{"type":{"names":["Object"]},"description":"Which permissions to request from the user for each external service.
","name":"requestPermissions"},{"type":{"names":["Object"]},"description":"To ask the user for permission to act on their behalf when offline, map the relevant external service to true. Currently only supported with Google. See Meteor.loginWithExternalService for more details.
If true, forces the user to approve the app's permissions, even if previously approved. Currently only supported with Google.
","name":"forceApprovalPrompt"},{"type":{"names":["String"]},"description":"Which fields to display in the user creation form. One of 'USERNAME_AND_EMAIL', 'USERNAME_AND_OPTIONAL_EMAIL', 'USERNAME_ONLY', or 'EMAIL_ONLY' (default).
New users with an email address will receive an address verification email.
","name":"sendVerificationEmail"},{"type":{"names":["Boolean"]},"description":"Calls to createUser from the client will be rejected. In addition, if you are using accounts-ui, the "Create account" link will not be available.
If set to a string, only allows new users if the domain part of their email address matches the string. If set to a function, only allows new users if the function returns true. The function is passed the full email address of the proposed new user. Works with password-based sign-in and external services that expose email addresses (Google, Facebook, GitHub). All existing users still can log in after enabling this option. Example: Accounts.config({ restrictCreationByEmailDomain: 'school.edu' }).
The number of days from when a user logs in until their token expires and they are logged out. Defaults to 90. Set to null to disable login expiration.
When using the oauth-encryption package, the 16 byte key using to encrypt sensitive account credentials in the database, encoded in base64. This option may only be specifed on the server. See packages/oauth-encryption/README.md for details.
Called whenever a login is attempted (either successful or unsuccessful). A login can be aborted by returning a falsy value or throwing an exception.
","name":"func"}],"name":"validateLoginAttempt","longname":"Accounts.validateLoginAttempt","kind":"function","memberof":"Accounts","scope":"static","___id":"T000002R000086","___s":true,"options":[],"locus":"Server"},"onLogin":{"meta":{"range":[1898,1973],"filename":"accounts_server.js","lineno":60,"path":"/Users/sashko/git/meteor/packages/accounts-base","code":{"id":"astnode100001093","name":"Accounts.onLogin","type":"FunctionExpression","value":"function","paramnames":["func"]}},"summary":"Register a callback to be called after a login attempt succeeds.","tags":[{"originalTitle":"locus","title":"locus","text":"Server","value":"Server"}],"params":[{"type":{"names":["function"]},"description":"The callback to be called when login is successful.
","name":"func"}],"name":"onLogin","longname":"Accounts.onLogin","kind":"function","memberof":"Accounts","scope":"static","___id":"T000002R000087","___s":true,"options":[],"locus":"Server"},"onLoginFailure":{"meta":{"range":[2155,2244],"filename":"accounts_server.js","lineno":69,"path":"/Users/sashko/git/meteor/packages/accounts-base","code":{"id":"astnode100001107","name":"Accounts.onLoginFailure","type":"FunctionExpression","value":"function","paramnames":["func"]}},"summary":"Register a callback to be called after a login attempt fails.","tags":[{"originalTitle":"locus","title":"locus","text":"Server","value":"Server"}],"params":[{"type":{"names":["function"]},"description":"The callback to be called after the login has failed.
","name":"func"}],"name":"onLoginFailure","longname":"Accounts.onLoginFailure","kind":"function","memberof":"Accounts","scope":"static","___id":"T000002R000088","___s":true,"options":[],"locus":"Server"},"onCreateUser":{"meta":{"range":[32747,32906],"filename":"accounts_server.js","lineno":986,"path":"/Users/sashko/git/meteor/packages/accounts-base","code":{"id":"astnode100003121","name":"Accounts.onCreateUser","type":"FunctionExpression","value":"function","paramnames":["func"]},"vars":{"onCreateUserHook":null}},"summary":"Customize new user creation.","tags":[{"originalTitle":"locus","title":"locus","text":"Server","value":"Server"}],"params":[{"type":{"names":["function"]},"description":"Called whenever a new user is created. Return the new user object, or throw an Error to abort the creation.
Called whenever a new user is created. Takes the new user object, and returns true to allow the creation or false to abort.
","name":"func"}],"name":"validateNewUser","longname":"Accounts.validateNewUser","kind":"function","memberof":"Accounts","scope":"static","___id":"T000002R000310","___s":true,"options":[],"locus":"Server"},"createUser":{"meta":{"range":[3912,4457],"filename":"password_client.js","lineno":108,"path":"/Users/sashko/git/meteor/packages/accounts-password","code":{"id":"astnode100009907","name":"Accounts.createUser","type":"FunctionExpression","value":"function","paramnames":["options","callback"]},"vars":{"options":null,"options.password":null}},"summary":"Create a new user.","tags":[{"originalTitle":"locus","title":"locus","text":"Anywhere","value":"Anywhere"}],"params":[{"type":{"names":["Object"]},"name":"options"},{"type":{"names":["function"]},"optional":true,"description":"Client only, optional callback. Called with no arguments on success, or with a single Error argument on failure.
A unique name for this user.
","name":"username"},{"type":{"names":["String"]},"description":"The user's email address.
","name":"email"},{"type":{"names":["String"]},"description":"The user's password. This is not sent in plain text over the wire.
","name":"password"},{"type":{"names":["Object"]},"description":"The user's profile, typically including the name field.
The user's current password. This is not sent in plain text over the wire.
","name":"oldPassword"},{"type":{"names":["String"]},"description":"A new password for the user. This is not sent in plain text over the wire.
","name":"newPassword"},{"type":{"names":["function"]},"optional":true,"description":"Optional callback. Called with no arguments on success, or with a single Error argument on failure.
Optional callback. Called with no arguments on success, or with a single Error argument on failure.
The email address to send a password reset link.
","name":"email"}],"locus":"Client"},"resetPassword":{"meta":{"range":[8168,8544],"filename":"password_client.js","lineno":226,"path":"/Users/sashko/git/meteor/packages/accounts-password","code":{"id":"astnode100010143","name":"Accounts.resetPassword","type":"FunctionExpression","value":"function","paramnames":["token","newPassword","callback"]}},"summary":"Reset the password for a user using a token received in email. Logs the user in afterwards.","tags":[{"originalTitle":"locus","title":"locus","text":"Client","value":"Client"}],"params":[{"type":{"names":["String"]},"description":"The token retrieved from the reset password URL.
","name":"token"},{"type":{"names":["String"]},"description":"A new password for the user. This is not sent in plain text over the wire.
","name":"newPassword"},{"type":{"names":["function"]},"optional":true,"description":"Optional callback. Called with no arguments on success, or with a single Error argument on failure.
The token retrieved from the verification URL.
","name":"token"},{"type":{"names":["function"]},"optional":true,"description":"Optional callback. Called with no arguments on success, or with a single Error argument on failure.
The id of the user to update.
","name":"userId"},{"type":{"names":["String"]},"description":"A new password for the user.
","name":"newPassword"}],"name":"setPassword","longname":"Accounts.setPassword","kind":"function","memberof":"Accounts","scope":"static","___id":"T000002R000827","___s":true,"options":[],"locus":"Server"},"sendResetPasswordEmail":{"meta":{"range":[11744,13104],"filename":"password_server.js","lineno":364,"path":"/Users/sashko/git/meteor/packages/accounts-password","code":{"id":"astnode100011176","name":"Accounts.sendResetPasswordEmail","type":"FunctionExpression","value":"function","paramnames":["userId","email"]},"vars":{"user":null,"email":null,"token":null,"when":null,"tokenRecord":null,".reset":null,"resetPasswordUrl":null,"options":null,"options.html":null}},"summary":"Send an email with a link the user can use to reset their password.","tags":[{"originalTitle":"locus","title":"locus","text":"Server","value":"Server"}],"params":[{"type":{"names":["String"]},"description":"The id of the user to send email to.
","name":"userId"},{"type":{"names":["String"]},"optional":true,"description":"Optional. Which address of the user's to send the email to. This address must be in the user's emails list. Defaults to the first email in the list.
The id of the user to send email to.
","name":"userId"},{"type":{"names":["String"]},"optional":true,"description":"Optional. Which address of the user's to send the email to. This address must be in the user's emails list. Defaults to the first email in the list.
The id of the user to send email to.
","name":"userId"},{"type":{"names":["String"]},"optional":true,"description":"Optional. Which address of the user's to send the email to. This address must be in the user's emails list. Defaults to the first unverified email in the list.
Optional callback. Called with no arguments on success, or with a single Error argument on failure.
Optional callback. Called with no arguments on success, or with a single Error argument on failure.
Either a string interpreted as a username or an email; or an object with a single key: email, username or id.
The user's password.
","name":"password"},{"type":{"names":["function"]},"optional":true,"description":"Optional callback. Called with no arguments on success, or with a single Error argument on failure.
The function to call when a new DDP connection is established.
","name":"callback"}],"memberof":"Meteor","name":"onConnection","longname":"Meteor.onConnection","kind":"function","scope":"static","___id":"T000002R052675","___s":true,"options":[],"locus":"Server"},"publish":{"meta":{"range":[45712,47678],"filename":"livedata_server.js","lineno":1370,"path":"/Users/sashko/git/meteor/packages/ddp","code":{"id":"astnode100290104","name":"publish","type":"FunctionExpression","value":"function"},"vars":{"self":null,"options":null,"self.warned_about_autopublish":null,"self.publish_handlers[undefined]":null,"":null}},"summary":"Publish a record set.","memberof":"Meteor","tags":[{"originalTitle":"locus","title":"locus","text":"Server","value":"Server"}],"params":[{"type":{"names":["String"]},"description":"Name of the record set. If null, the set has no name, and the record set is automatically sent to all connected clients.
Function called on the server each time a client subscribes. Inside the function, this is the publish handler object, described below. If the client passed arguments to subscribe, the function is called with the same arguments.
Dictionary whose keys are method names and values are functions.
","name":"methods"}],"memberof":"Meteor","name":"methods","longname":"Meteor.methods","kind":"function","scope":"static","___id":"T000002R052693","___s":true,"options":[],"locus":"Anywhere"},"startup":{"meta":{"range":[651,1018],"filename":"startup_client.js","lineno":27,"path":"/Users/sashko/git/meteor/packages/meteor","code":{"id":"astnode100388207","name":"Meteor.startup","type":"FunctionExpression","value":"function","paramnames":["cb"]},"vars":{"doScroll":null,"":null}},"summary":"Run code when a client or a server starts.","tags":[{"originalTitle":"locus","title":"locus","text":"Anywhere","value":"Anywhere"}],"params":[{"type":{"names":["function"]},"description":"A function to run on startup.
","name":"func"}],"name":"startup","longname":"Meteor.startup","kind":"function","memberof":"Meteor","scope":"static","___id":"T000002R066219","___s":true,"options":[],"locus":"Anywhere"},"setTimeout":{"meta":{"range":[959,1072],"filename":"timers.js","lineno":28,"path":"/Users/sashko/git/meteor/packages/meteor","code":{"id":"astnode100388370","name":"setTimeout","type":"FunctionExpression","value":"function"}},"memberof":"Meteor","summary":"Call a function in the future after waiting for a specified delay.","tags":[{"originalTitle":"locus","title":"locus","text":"Anywhere","value":"Anywhere"}],"params":[{"type":{"names":["function"]},"description":"The function to run
","name":"func"},{"type":{"names":["Number"]},"description":"Number of milliseconds to wait before calling function
","name":"delay"}],"name":"setTimeout","longname":"Meteor.setTimeout","kind":"function","scope":"static","___id":"T000002R066225","___s":true,"options":[],"locus":"Anywhere"},"setInterval":{"meta":{"range":[1341,1457],"filename":"timers.js","lineno":39,"path":"/Users/sashko/git/meteor/packages/meteor","code":{"id":"astnode100388383","name":"setInterval","type":"FunctionExpression","value":"function"}},"memberof":"Meteor","summary":"Call a function repeatedly, with a time delay between calls.","tags":[{"originalTitle":"locus","title":"locus","text":"Anywhere","value":"Anywhere"}],"params":[{"type":{"names":["function"]},"description":"The function to run
","name":"func"},{"type":{"names":["Number"]},"description":"Number of milliseconds to wait between each function call.
","name":"delay"}],"name":"setInterval","longname":"Meteor.setInterval","kind":"function","scope":"static","___id":"T000002R066226","___s":true,"options":[],"locus":"Anywhere"},"clearInterval":{"meta":{"range":[1667,1728],"filename":"timers.js","lineno":49,"path":"/Users/sashko/git/meteor/packages/meteor","code":{"id":"astnode100388396","name":"clearInterval","type":"FunctionExpression","value":"function"}},"memberof":"Meteor","summary":"Cancel a repeating function call scheduled by `Meteor.setInterval`.","tags":[{"originalTitle":"locus","title":"locus","text":"Anywhere","value":"Anywhere"}],"params":[{"type":{"names":["Number"]},"description":"The handle returned by Meteor.setInterval
The handle returned by Meteor.setTimeout
A path to append to the root URL. Do not include a leading "/".
Create an HTTPS URL.
","name":"secure"},{"type":{"names":["Boolean"]},"description":"Replace localhost with 127.0.0.1. Useful for services that don't recognize localhost as a domain name.
","name":"replaceLocalhost"},{"type":{"names":["String"]},"description":"Override the default ROOT_URL from the server environment. For example: "http://foo.example.com"
Function to call. It will be called with three arguments: the document, a 0-based index, and cursor itself.
","name":"callback"},{"type":{"names":["Any"]},"optional":true,"description":"An object which will be the value of this inside callback.
Function to call. It will be called with three arguments: the document, a 0-based index, and cursor itself.
","name":"callback"},{"type":{"names":["Any"]},"optional":true,"description":"An object which will be the value of this inside callback.
Functions to call to deliver the result set as it changes
","name":"callbacks"}],"name":"observe","longname":"Meteor.Collection.Cursor#observe","kind":"function","___id":"T000002R066585","___s":true,"options":[],"locus":"Anywhere"},"Cursor#observeChanges":{"meta":{"range":[10538,14491],"filename":"minimongo.js","lineno":322,"path":"/Users/sashko/git/meteor/packages/minimongo","code":{"id":"astnode100393504","name":"observeChanges","type":"FunctionExpression","value":"function"},"vars":{"self":null,"ordered":null,"query":null,"qid":null,"self.collection.queries[undefined]":null,"query.results":null,"query.resultsSnapshot":null,"wrapCallback":null,"":null,"query.added":null,"query.changed":null,"query.removed":null,"query.addedBefore":null,"query.movedBefore":null,"each":null,"handle":null}},"summary":"Watch a query. Receive callbacks as the result set changes. Only the differences between the old and new documents are passed to the callbacks.","tags":[{"originalTitle":"locus","title":"locus","text":"Anywhere","value":"Anywhere"}],"memberof":"Meteor.Collection.Cursor","scope":"instance","params":[{"type":{"names":["Object"]},"description":"Functions to call to deliver the result set as it changes
","name":"callbacks"}],"name":"observeChanges","longname":"Meteor.Collection.Cursor#observeChanges","kind":"function","___id":"T000002R066587","___s":true,"options":[],"locus":"Anywhere"},"Cursor":{"meta":{"range":[2780,2967],"filename":"minimongo.js","lineno":89,"path":"/Users/sashko/git/meteor/packages/minimongo","code":{}},"summary":"To create a cursor, use find. To access the documents in a cursor, use forEach, map, or fetch.","kind":"class","name":"Cursor","memberof":"Meteor.Collection","tags":[{"originalTitle":"instanceName","title":"instancename","text":"cursor","value":"cursor"}],"scope":"static","longname":"Meteor.Collection.Cursor","___id":"T000002R066527","___s":true,"options":[],"params":[],"instancename":"cursor"},"meta":{"range":[1419,8435],"filename":"collection.js","lineno":20,"path":"/Users/sashko/git/meteor/packages/mongo","code":{"id":"astnode100412071","name":"Meteor.Collection","type":"FunctionExpression","value":"function","paramnames":["name","options"]},"vars":{"self":null,"name":null,"options":null,"options.connection":null,"self._makeNewID":null,"":null,"self._transform":null,"self._connection":null,"options._driver":null,"self._collection":null,"self._name":null,"ok":null}},"summary":"Constructor for a Collection","tags":[{"originalTitle":"locus","title":"locus","text":"Anywhere","value":"Anywhere"},{"originalTitle":"instancename","title":"instancename","text":"collection","value":"collection"}],"kind":"class","params":[{"type":{"names":["String"]},"description":"The name of the collection. If null, creates an unmanaged (unsynchronized) local collection.
","name":"name"},{"type":{"names":["Object"]},"optional":true,"name":"options"}],"name":"Collection","longname":"Meteor.Collection","memberof":"Meteor","scope":"static","___id":"T000002R068406","___s":true,"options":[{"type":{"names":["Object"]},"description":"The server connection that will manage this collection. Uses the default connection if not specified. Pass the return value of calling DDP.connect to specify a different server. Pass null to specify no connection. Unmanaged (name is null) collections cannot specify a connection.
The method of generating the _id fields of new documents in this collection. Possible values:
- \n
'STRING': random strings \n'MONGO': randomMeteor.Collection.ObjectIDvalues \n
The default id generation technique is 'STRING'.
An optional transformation function. Documents will be passed through this function before being returned from fetch or findOne, and before being passed to callbacks of observe, map, forEach, allow, and deny. Transforms are not applied for the callbacks of observeChanges or to cursors returned from publish functions.
Optional. The 24-character hexadecimal contents of the ObjectID to create
","name":"hexString"}],"name":"ObjectID","longname":"Meteor.Collection.ObjectID","memberof":"Meteor.Collection","scope":"static","___id":"T000002R068531","___s":true,"options":[],"locus":"Anywhere"}},"Collection#insert":{"meta":{"range":[15926,16365],"filename":"collection.js","lineno":407,"path":"/Users/sashko/git/meteor/packages/mongo","code":{}},"summary":"Insert a document in the collection. Returns its unique _id.","tags":[{"originalTitle":"locus","title":"locus","text":"Anywhere","value":"Anywhere"}],"kind":"function","name":"insert","memberof":"Meteor.Collection","scope":"instance","params":[{"type":{"names":["Object"]},"description":"The document to insert. May not yet have an _id attribute, in which case Meteor will generate one for you.
","name":"doc"},{"type":{"names":["function"]},"optional":true,"description":"Optional. If present, called with an error object as the first argument and, if no error, the _id as the second.
","name":"callback"}],"longname":"Meteor.Collection#insert","___id":"T000002R068404","___s":true,"options":[],"locus":"Anywhere"},"Collection#update":{"meta":{"range":[16367,17137],"filename":"collection.js","lineno":417,"path":"/Users/sashko/git/meteor/packages/mongo","code":{}},"summary":"Modify one or more documents in the collection. Returns the number of affected documents.","tags":[{"originalTitle":"locus","title":"locus","text":"Anywhere","value":"Anywhere"}],"kind":"function","name":"update","memberof":"Meteor.Collection","scope":"instance","params":[{"type":{"names":["MongoSelector"]},"description":"Specifies which documents to modify
","name":"selector"},{"type":{"names":["MongoModifier"]},"description":"Specifies how to modify the documents
","name":"modifier"},{"type":{"names":["Object"]},"optional":true,"name":"options"},{"type":{"names":["function"]},"optional":true,"description":"Optional. If present, called with an error object as the first argument and, if no error, the number of affected documents as the second.
","name":"callback"}],"longname":"Meteor.Collection#update","___id":"T000002R068405","___s":true,"options":[{"type":{"names":["Boolean"]},"description":"True to modify all matching documents; false to only modify one of the matching documents (the default).
","name":"multi"},{"type":{"names":["Boolean"]},"description":"True to insert a document if no matching documents are found.
","name":"upsert"}],"locus":"Anywhere"},"Collection#find":{"meta":{"range":[9195,10059],"filename":"collection.js","lineno":245,"path":"/Users/sashko/git/meteor/packages/mongo","code":{}},"summary":"Find the documents in a collection that match the selector.","tags":[{"originalTitle":"locus","title":"locus","text":"Anywhere","value":"Anywhere"}],"kind":"function","name":"find","memberof":"Meteor.Collection","scope":"instance","params":[{"type":{"names":["MongoSelector"]},"optional":true,"description":"A query describing the documents to find
","name":"selector"},{"type":{"names":["Object"]},"optional":true,"name":"options"}],"longname":"Meteor.Collection#find","___id":"T000002R068456","___s":true,"options":[{"type":{"names":["MongoSortSpecifier"]},"description":"Sort order (default: natural order)
","name":"sort"},{"type":{"names":["Number"]},"description":"Number of results to skip at the beginning
","name":"skip"},{"type":{"names":["Number"]},"description":"Maximum number of results to return
","name":"limit"},{"type":{"names":["MongoFieldSpecifier"]},"description":"Dictionary of fields to return or exclude.
","name":"fields"},{"type":{"names":["Boolean"]},"description":"(Client only) Default true; pass false to disable reactivity
Overrides transform on the Collection for this cursor. Pass null to disable transformation.
A query describing the documents to find
","name":"selector"},{"type":{"names":["Object"]},"optional":true,"name":"options"}],"longname":"Meteor.Collection#findOne","___id":"T000002R068460","___s":true,"options":[{"type":{"names":["MongoSortSpecifier"]},"description":"Sort order (default: natural order)
","name":"sort"},{"type":{"names":["Number"]},"description":"Number of results to skip at the beginning
","name":"skip"},{"type":{"names":["MongoFieldSpecifier"]},"description":"Dictionary of fields to return or exclude.
","name":"fields"},{"type":{"names":["Boolean"]},"description":"(Client only) Default true; pass false to disable reactivity
","name":"reactive"},{"type":{"names":["function"]},"description":"Overrides transform on the Collection for this cursor. Pass null to disable transformation.
Specifies which documents to remove
","name":"selector"},{"type":{"names":["function"]},"optional":true,"description":"Optional. If present, called with an error object as its argument.
","name":"callback"}],"longname":"Meteor.Collection#remove","___id":"T000002R068487","___s":true,"options":[],"locus":"Anywhere"},"Collection#upsert":{"meta":{"range":[23713,24109],"filename":"collection.js","lineno":593,"path":"/Users/sashko/git/meteor/packages/mongo","code":{"id":"astnode100413675","name":"Meteor.Collection.prototype.upsert","type":"FunctionExpression","value":"function","paramnames":["selector","modifier","options","callback"]},"vars":{"self":null,"callback":null,"options":null}},"summary":"Modify one or more documents in the collection, or insert one if no matching documents were found. Returns an object with keys `numberAffected` (the number of documents modified) and `insertedId` (the unique _id of the document that was inserted, if any).","tags":[{"originalTitle":"locus","title":"locus","text":"Anywhere","value":"Anywhere"}],"params":[{"type":{"names":["MongoSelector"]},"description":"Specifies which documents to modify
","name":"selector"},{"type":{"names":["MongoModifier"]},"description":"Specifies how to modify the documents
","name":"modifier"},{"type":{"names":["Object"]},"optional":true,"name":"options"},{"type":{"names":["function"]},"optional":true,"description":"Optional. If present, called with an error object as the first argument and, if no error, the number of affected documents as the second.
","name":"callback"}],"name":"upsert","longname":"Meteor.Collection#upsert","kind":"function","memberof":"Meteor.Collection","scope":"instance","___id":"T000002R068517","___s":true,"options":[{"type":{"names":["Boolean"]},"description":"True to modify all matching documents; false to only modify one of the matching documents (the default).
","name":"multi"}],"locus":"Anywhere"},"Collection#allow":{"meta":{"range":[29204,29310],"filename":"collection.js","lineno":727,"path":"/Users/sashko/git/meteor/packages/mongo","code":{"id":"astnode100414059","name":"Meteor.Collection.prototype.allow","type":"FunctionExpression","value":"function","paramnames":["options"]}},"summary":"Allow users to write directly to this collection from client code, subject to limitations you define.","tags":[{"originalTitle":"locus","title":"locus","text":"Server","value":"Server"}],"params":[{"type":{"names":["Object"]},"name":"options"}],"name":"allow","longname":"Meteor.Collection#allow","kind":"function","memberof":"Meteor.Collection","scope":"instance","___id":"T000002R068538","___s":true,"options":[{"type":{"names":["function"]},"name":"insert"},{"type":{"names":["function"]},"name":"update"},{"type":{"names":["function"]},"description":"Functions that look at a proposed modification to the database and return true if it should be allowed.
","name":"remove"},{"type":{"names":["Array.Optional performance enhancement. Limits the fields that will be fetched from the database for inspection by your update and remove functions.
Overrides transform on the Collection. Pass null to disable transformation.
Functions that look at a proposed modification to the database and return true if it should be denied, even if an allow rule says otherwise.
Optional performance enhancement. Limits the fields that will be fetched from the database for inspection by your update and remove functions.
Overrides transform on the Collection. Pass null to disable transformation.
A numeric error code, likely similar to an HTTP code (eg, 404, 500).
","name":"error"},{"type":{"names":["String"]},"optional":true,"description":"Optional. A short human-readable summary of the error, like 'Not Found'.
","name":"reason"},{"type":{"names":["String"]},"optional":true,"description":"Optional. Additional information about the error, like a textual stack trace.
","name":"details"}],"name":"Error","longname":"Meteor.Error","memberof":"Meteor","scope":"static","___id":"T000002R065936","___s":true,"options":[],"locus":"Anywhere"}},"MethodInvocation#isSimulation":{"comment":"/**\n * @summary Access inside a method invocation. Boolean value, true if this invocation is a stub.\n * @locus Anywhere\n * @name isSimulation\n * @memberOf MethodInvocation\n * @instance\n */","meta":{"range":[895,1097],"filename":"livedata_common.js","lineno":24,"path":"/Users/sashko/git/meteor/packages/ddp","code":{}},"summary":"Access inside a method invocation. Boolean value, true if this invocation is a stub.","tags":[{"originalTitle":"locus","title":"locus","text":"Anywhere","value":"Anywhere"}],"name":"isSimulation","memberof":"MethodInvocation","scope":"instance","longname":"MethodInvocation#isSimulation","kind":"member","___id":"T000002R051095","___s":true,"locus":"Anywhere"},"MethodInvocation#userId":{"comment":"/**\n * @summary The id of the user that made this method call, or `null` if no user was logged in.\n * @locus Anywhere\n * @name userId\n * @memberOf MethodInvocation\n * @instance\n */","meta":{"range":[1407,1600],"filename":"livedata_common.js","lineno":41,"path":"/Users/sashko/git/meteor/packages/ddp","code":{}},"summary":"The id of the user that made this method call, or `null` if no user was logged in.","tags":[{"originalTitle":"locus","title":"locus","text":"Anywhere","value":"Anywhere"}],"name":"userId","memberof":"MethodInvocation","scope":"instance","longname":"MethodInvocation#userId","kind":"member","___id":"T000002R051099","___s":true,"locus":"Anywhere"},"MethodInvocation#connection":{"comment":"/**\n * @summary Access inside a method invocation. The [connection](#meteor_onconnection) that this method was received on. `null` if the method is not associated with a connection, eg. a server initiated method call.\n * @locus Server\n * @name connection\n * @memberOf MethodInvocation\n * @instance\n */","meta":{"range":[1852,2166],"filename":"livedata_common.js","lineno":56,"path":"/Users/sashko/git/meteor/packages/ddp","code":{}},"summary":"Access inside a method invocation. The [connection](#meteor_onconnection) that this method was received on. `null` if the method is not associated with a connection, eg. a server initiated method call.","tags":[{"originalTitle":"locus","title":"locus","text":"Server","value":"Server"}],"name":"connection","memberof":"MethodInvocation","scope":"instance","longname":"MethodInvocation#connection","kind":"member","___id":"T000002R051102","___s":true,"locus":"Server"},"Subscription#connection":{"comment":"/**\n * @summary Access inside the publish function. The incoming [connection](#meteor_onconnection) for this subscription.\n * @locus Server\n * @name connection\n * @memberOf Subscription\n * @instance\n */","meta":{"range":[27477,27692],"filename":"livedata_server.js","lineno":863,"path":"/Users/sashko/git/meteor/packages/ddp","code":{}},"summary":"Access inside the publish function. The incoming [connection](#meteor_onconnection) for this subscription.","tags":[{"originalTitle":"locus","title":"locus","text":"Server","value":"Server"}],"name":"connection","memberof":"Subscription","scope":"instance","longname":"Subscription#connection","kind":"member","___id":"T000002R052599","___s":true,"locus":"Server"},"Subscription#userId":{"comment":"/**\n * @summary Access inside the publish function. The id of the logged-in user, or `null` if no user is logged in.\n * @locus Server\n * @memberOf Subscription\n * @name userId\n * @instance\n */","meta":{"range":[28731,28936],"filename":"livedata_server.js","lineno":905,"path":"/Users/sashko/git/meteor/packages/ddp","code":{}},"summary":"Access inside the publish function. The id of the logged-in user, or `null` if no user is logged in.","tags":[{"originalTitle":"locus","title":"locus","text":"Server","value":"Server"}],"memberof":"Subscription","name":"userId","scope":"instance","longname":"Subscription#userId","kind":"member","___id":"T000002R052611","___s":true,"locus":"Server"},"Tracker":{"active":{"comment":"/**\n * @summary True if there is a current computation, meaning that dependencies on reactive data sources will be tracked and potentially cause the current computation to be rerun.\n * @locus Client\n */","meta":{"range":[418,440],"filename":"tracker.js","lineno":13,"path":"/Users/sashko/git/meteor/packages/tracker","code":{"id":"astnode100507105","name":"Tracker.active","type":"Literal","value":"false","paramnames":[]}},"summary":"True if there is a current computation, meaning that dependencies on reactive data sources will be tracked and potentially cause the current computation to be rerun.","tags":[{"originalTitle":"locus","title":"locus","text":"Client","value":"Client"}],"name":"active","longname":"Tracker.active","kind":"member","memberof":"Tracker","scope":"static","___id":"T000002R076202","___s":true,"locus":"Client"},"currentComputation":{"comment":"/**\n * @summary The current computation, or `null` if there isn't one. The current computation is the [`Tracker.Computation`](#tracker_computation) object created by the innermost active call to `Tracker.autorun`, and it's the computation that gains dependencies when reactive data sources are accessed.\n * @locus Client\n */","meta":{"range":[824,857],"filename":"tracker.js","lineno":21,"path":"/Users/sashko/git/meteor/packages/tracker","code":{"id":"astnode100507111","name":"Tracker.currentComputation","type":"Literal","value":"null","paramnames":[]}},"summary":"The current computation, or `null` if there isn't one. The current computation is the [`Tracker.Computation`](#tracker_computation) object created by the innermost active call to `Tracker.autorun`, and it's the computation that gains dependencies when reactive data sources are accessed.","tags":[{"originalTitle":"locus","title":"locus","text":"Client","value":"Client"}],"name":"currentComputation","longname":"Tracker.currentComputation","kind":"member","memberof":"Tracker","scope":"static","___id":"T000002R076203","___s":true,"locus":"Client"},"Computation#stopped":{"comment":"/**\n * @summary True if this computation has been stopped.\n * @locus Client\n * @memberOf Tracker.Computation\n * @instance\n * @name stopped\n */","meta":{"range":[4547,4702],"filename":"tracker.js","lineno":132,"path":"/Users/sashko/git/meteor/packages/tracker","code":{}},"summary":"True if this computation has been stopped.","tags":[{"originalTitle":"locus","title":"locus","text":"Client","value":"Client"}],"memberof":"Tracker.Computation","scope":"instance","name":"stopped","longname":"Tracker.Computation#stopped","kind":"member","___id":"T000002R076229","___s":true,"locus":"Client"},"Computation#invalidated":{"comment":"/**\n * @summary True if this computation has been invalidated (and not yet rerun), or if it has been stopped.\n * @locus Client\n * @memberOf Tracker.Computation\n * @instance\n * @name invalidated\n */","meta":{"range":[4784,4994],"filename":"tracker.js","lineno":143,"path":"/Users/sashko/git/meteor/packages/tracker","code":{}},"summary":"True if this computation has been invalidated (and not yet rerun), or if it has been stopped.","tags":[{"originalTitle":"locus","title":"locus","text":"Client","value":"Client"}],"memberof":"Tracker.Computation","scope":"instance","name":"invalidated","longname":"Tracker.Computation#invalidated","kind":"member","___id":"T000002R076231","___s":true,"locus":"Client"},"Computation#firstRun":{"comment":"/**\n * @summary True during the initial run of the computation at the time `Tracker.autorun` is called, and false on subsequent reruns and at other times.\n * @locus Client\n * @memberOf Tracker.Computation\n * @instance\n * @name firstRun\n */","meta":{"range":[5077,5329],"filename":"tracker.js","lineno":154,"path":"/Users/sashko/git/meteor/packages/tracker","code":{}},"summary":"True during the initial run of the computation at the time `Tracker.autorun` is called, and false on subsequent reruns and at other times.","tags":[{"originalTitle":"locus","title":"locus","text":"Client","value":"Client"}],"memberof":"Tracker.Computation","scope":"instance","name":"firstRun","longname":"Tracker.Computation#firstRun","kind":"member","___id":"T000002R076233","___s":true,"locus":"Client"},"Computation":{"meta":{"range":[4266,5759],"filename":"tracker.js","lineno":122,"path":"/Users/sashko/git/meteor/packages/tracker","code":{"id":"astnode100507360","name":"Tracker.Computation","type":"FunctionExpression","value":"function","paramnames":["f","parent"]},"vars":{"constructingComputation":null,"self":null,"self.stopped":null,"self.invalidated":null,"self.firstRun":null,"self._id":null,"self._onInvalidateCallbacks":null,"self._parent":null,"self._func":null,"self._recomputing":null,"errored":null}},"summary":"A Computation object represents code that is repeatedly rerun\nin response to\nreactive data changes. Computations don't have return values; they just\nperform actions, such as rerendering a template on the screen. Computations\nare created using Tracker.autorun. Use stop to prevent further rerunning of a\ncomputation.","tags":[{"originalTitle":"instancename","title":"instancename","text":"computation","value":"computation"}],"name":"Computation","longname":"Tracker.Computation","kind":"function","memberof":"Tracker","scope":"static","___id":"T000002R076226","___s":true,"options":[],"params":[],"instancename":"computation"},"Computation#onInvalidate":{"meta":{"range":[6268,6602],"filename":"tracker.js","lineno":189,"path":"/Users/sashko/git/meteor/packages/tracker","code":{"id":"astnode100507462","name":"Tracker.Computation.prototype.onInvalidate","type":"FunctionExpression","value":"function","paramnames":["f"]},"vars":{"self":null,"":null}},"summary":"Registers `callback` to run when this computation is next invalidated, or runs it immediately if the computation is already invalidated. The callback is run exactly once and not upon future invalidations unless `onInvalidate` is called again after the computation becomes valid again.","tags":[{"originalTitle":"locus","title":"locus","text":"Client","value":"Client"}],"params":[{"type":{"names":["function"]},"description":"Function to be called on invalidation. Receives one argument, the computation that was invalidated.
","name":"callback"}],"name":"onInvalidate","longname":"Tracker.Computation#onInvalidate","kind":"function","memberof":"Tracker.Computation","scope":"instance","___id":"T000002R076243","___s":true,"options":[],"locus":"Client"},"Computation#invalidate":{"meta":{"range":[6748,7393],"filename":"tracker.js","lineno":210,"path":"/Users/sashko/git/meteor/packages/tracker","code":{"id":"astnode100507514","name":"Tracker.Computation.prototype.invalidate","type":"FunctionExpression","value":"function","paramnames":[]},"vars":{"self":null,"self.invalidated":null,"i":null,"f":null,"":null,"self._onInvalidateCallbacks":null}},"summary":"Invalidates this computation so that it will be rerun.","tags":[{"originalTitle":"locus","title":"locus","text":"Client","value":"Client"}],"name":"invalidate","longname":"Tracker.Computation#invalidate","kind":"function","memberof":"Tracker.Computation","scope":"instance","___id":"T000002R076245","___s":true,"options":[],"params":[],"locus":"Client"},"Computation#stop":{"meta":{"range":[7520,7648],"filename":"tracker.js","lineno":239,"path":"/Users/sashko/git/meteor/packages/tracker","code":{"id":"astnode100507597","name":"Tracker.Computation.prototype.stop","type":"FunctionExpression","value":"function","paramnames":[]},"vars":{"this.stopped":null}},"summary":"Prevents this computation from rerunning.","tags":[{"originalTitle":"locus","title":"locus","text":"Client","value":"Client"}],"name":"stop","longname":"Tracker.Computation#stop","kind":"function","memberof":"Tracker.Computation","scope":"instance","___id":"T000002R076252","___s":true,"options":[],"params":[],"locus":"Client"},"Dependency#depend":{"meta":{"range":[9967,10409],"filename":"tracker.js","lineno":317,"path":"/Users/sashko/git/meteor/packages/tracker","code":{"id":"astnode100507749","name":"Tracker.Dependency.prototype.depend","type":"FunctionExpression","value":"function","paramnames":["computation"]},"vars":{"computation":null,"self":null,"id":null,"self._dependentsById[undefined]":null,"":null}},"summary":"Declares that the current computation (or `fromComputation` if given) depends on `dependency`. The computation will be invalidated the next time `dependency` changes.\n\nIf there is no current computation and `depend()` is called with no arguments, it does nothing and returns false.\n\nReturns true if the computation is a new dependent of `dependency` rather than an existing one.","tags":[{"originalTitle":"locus","title":"locus","text":"Client","value":"Client"}],"params":[{"type":{"names":["Tracker.Computation"]},"optional":true,"description":"An optional computation declared to depend on dependency instead of the current computation.
The function to run. It receives one argument: the Computation object that will be returned.
","name":"runFunc"}],"name":"autorun","longname":"Tracker.autorun","kind":"function","memberof":"Tracker","scope":"static","___id":"T000002R076290","___s":true,"options":[],"locus":"Client"},"nonreactive":{"meta":{"range":[14340,14533],"filename":"tracker.js","lineno":465,"path":"/Users/sashko/git/meteor/packages/tracker","code":{"id":"astnode100508051","name":"Tracker.nonreactive","type":"FunctionExpression","value":"function","paramnames":["f"]},"vars":{"previous":null}},"summary":"Run a function without tracking dependencies.","tags":[{"originalTitle":"locus","title":"locus","text":"Client","value":"Client"}],"params":[{"type":{"names":["function"]},"description":"A function to call immediately.
","name":"func"}],"name":"nonreactive","longname":"Tracker.nonreactive","kind":"function","memberof":"Tracker","scope":"static","___id":"T000002R076293","___s":true,"options":[],"locus":"Client"},"onInvalidate":{"meta":{"range":[14970,15155],"filename":"tracker.js","lineno":482,"path":"/Users/sashko/git/meteor/packages/tracker","code":{"id":"astnode100508079","name":"Tracker.onInvalidate","type":"FunctionExpression","value":"function","paramnames":["f"]}},"summary":"Registers a new [`onInvalidate`](#computation_oninvalidate) callback on the current computation (which must exist), to be called immediately when the current computation is invalidated or stopped.","tags":[{"originalTitle":"locus","title":"locus","text":"Client","value":"Client"}],"params":[{"type":{"names":["function"]},"description":"A callback function that will be invoked as func(c), where c is the computation on which the callback is registered.
A function to call at flush time.
","name":"callback"}],"name":"afterFlush","longname":"Tracker.afterFlush","kind":"function","memberof":"Tracker","scope":"static","___id":"T000002R076296","___s":true,"options":[],"locus":"Client"},"Dependency":{"meta":{"range":[9057,9122],"filename":"tracker.js","lineno":297,"path":"/Users/sashko/git/meteor/packages/tracker","code":{"id":"astnode100507736","name":"Tracker.Dependency","type":"FunctionExpression","value":"function","paramnames":[]},"vars":{"this._dependentsById":null}},"summary":"A Dependency represents an atomic unit of reactive data that a\ncomputation might depend on. Reactive data sources such as Session or\nMinimongo internally create different Dependency objects for different\npieces of data, each of which may be depended on by multiple computations.\nWhen the data changes, the computations are invalidated.","kind":"class","tags":[{"originalTitle":"instanceName","title":"instancename","text":"dependency","value":"dependency"}],"name":"Dependency","longname":"Tracker.Dependency","memberof":"Tracker","scope":"static","___id":"T000002R076265","___s":true,"options":[],"params":[],"instancename":"dependency"}},"MethodInvocation":{"meta":{"range":[372,2398],"filename":"livedata_common.js","lineno":13,"path":"/Users/sashko/git/meteor/packages/ddp","code":{"id":"astnode100272408","name":"MethodInvocation","type":"FunctionExpression","value":"function","paramnames":["options"]},"vars":{"self":null,"this.isSimulation":null,"this._unblock":null,"":null,"this._calledUnblock":null,"this.userId":null,"this._setUserId":null,"this.connection":null,"this.randomSeed":null,"this.randomStream":null}},"summary":"The state for a single invocation of a method, referenced by this\ninside a method definition.","params":[{"type":{"names":["Object"]},"name":"options"}],"tags":[{"originalTitle":"instanceName","title":"instancename","text":"this","value":"this"}],"name":"MethodInvocation","longname":"MethodInvocation","kind":"function","scope":"global","___id":"T000002R051093","___s":true,"options":[],"instancename":"this"},"MethodInvocation#unblock":{"meta":{"range":[2642,2742],"filename":"livedata_common.js","lineno":79,"path":"/Users/sashko/git/meteor/packages/ddp","code":{"id":"astnode100272492","name":"unblock","type":"FunctionExpression","value":"function"},"vars":{"self":null,"self._calledUnblock":null}},"summary":"Call inside a method invocation. Allow subsequent method from this client to begin running in a new fiber.","tags":[{"originalTitle":"locus","title":"locus","text":"Server","value":"Server"}],"memberof":"MethodInvocation","scope":"instance","name":"unblock","longname":"MethodInvocation#unblock","kind":"function","___id":"T000002R051106","___s":true,"options":[],"params":[],"locus":"Server"},"MethodInvocation#setUserId":{"meta":{"range":[2964,3183],"filename":"livedata_common.js","lineno":92,"path":"/Users/sashko/git/meteor/packages/ddp","code":{"id":"astnode100272510","name":"setUserId","type":"FunctionExpression","value":"function"},"vars":{"self":null,"self.userId":null}},"summary":"Set the logged in user.","tags":[{"originalTitle":"locus","title":"locus","text":"Server","value":"Server"}],"memberof":"MethodInvocation","scope":"instance","params":[{"type":{"names":["String","null"]},"description":"The value that should be returned by userId on this connection.
The URL of another Meteor application.
","name":"url"}],"name":"connect","longname":"DDP.connect","kind":"function","memberof":"DDP","scope":"static","___id":"T000002R051464","___s":true,"options":[],"locus":"Anywhere"}},"Subscription#error":{"meta":{"range":[35098,35259],"filename":"livedata_server.js","lineno":1074,"path":"/Users/sashko/git/meteor/packages/ddp","code":{"id":"astnode100289390","name":"error","type":"FunctionExpression","value":"function"},"vars":{"self":null}},"summary":"Call inside the publish function. Stops this client's subscription, triggering a call on the client to the `onError` callback passed to [`Meteor.subscribe`](#meteor_subscribe), if any. If `error` is not a [`Meteor.Error`](#meteor_error), it will be [sanitized](#meteor_error).","tags":[{"originalTitle":"locus","title":"locus","text":"Server","value":"Server"}],"params":[{"type":{"names":["Error"]},"description":"The error to pass to the client.
","name":"error"}],"scope":"instance","memberof":"Subscription","name":"error","longname":"Subscription#error","kind":"function","___id":"T000002R052635","___s":true,"options":[],"locus":"Server"},"Subscription#stop":{"meta":{"range":[35755,35903],"filename":"livedata_server.js","lineno":1092,"path":"/Users/sashko/git/meteor/packages/ddp","code":{"id":"astnode100289415","name":"stop","type":"FunctionExpression","value":"function"},"vars":{"self":null}},"summary":"Call inside the publish function. Stops this client's subscription; the `onError` callback is *not* invoked on the client.","tags":[{"originalTitle":"locus","title":"locus","text":"Server","value":"Server"}],"scope":"instance","memberof":"Subscription","name":"stop","longname":"Subscription#stop","kind":"function","___id":"T000002R052637","___s":true,"options":[],"params":[],"locus":"Server"},"Subscription#onStop":{"meta":{"range":[36152,36306],"filename":"livedata_server.js","lineno":1106,"path":"/Users/sashko/git/meteor/packages/ddp","code":{"id":"astnode100289438","name":"onStop","type":"FunctionExpression","value":"function"},"vars":{"self":null}},"summary":"Call inside the publish function. Registers a callback function to run when the subscription is stopped.","tags":[{"originalTitle":"locus","title":"locus","text":"Server","value":"Server"}],"memberof":"Subscription","scope":"instance","params":[{"type":{"names":["function"]},"description":"The callback function
","name":"func"}],"name":"onStop","longname":"Subscription#onStop","kind":"function","___id":"T000002R052639","___s":true,"options":[],"locus":"Server"},"Subscription#added":{"meta":{"range":[37038,37338],"filename":"livedata_server.js","lineno":1131,"path":"/Users/sashko/git/meteor/packages/ddp","code":{"id":"astnode100289481","name":"added","type":"FunctionExpression","value":"function"},"vars":{"self":null,"id":null,"[undefined]":null}},"summary":"Call inside the publish function. Informs the subscriber that a document has been added to the record set.","tags":[{"originalTitle":"locus","title":"locus","text":"Server","value":"Server"}],"memberof":"Subscription","scope":"instance","params":[{"type":{"names":["String"]},"description":"The name of the collection that contains the new document.
","name":"collection"},{"type":{"names":["String"]},"description":"The new document's ID.
","name":"id"},{"type":{"names":["Object"]},"description":"The fields in the new document. If _id is present it is ignored.
The name of the collection that contains the changed document.
","name":"collection"},{"type":{"names":["String"]},"description":"The changed document's ID.
","name":"id"},{"type":{"names":["Object"]},"description":"The fields in the document that have changed, together with their new values. If a field is not present in fields it was left unchanged; if it is present in fields and has a value of undefined it was removed from the document. If _id is present it is ignored.
The name of the collection that the document has been removed from.
","name":"collection"},{"type":{"names":["String"]},"description":"The ID of the document that has been removed.
","name":"id"}],"name":"removed","longname":"Subscription#removed","kind":"function","___id":"T000002R052650","___s":true,"options":[],"locus":"Server"},"Subscription#ready":{"meta":{"range":[39354,39646],"filename":"livedata_server.js","lineno":1182,"path":"/Users/sashko/git/meteor/packages/ddp","code":{"id":"astnode100289618","name":"ready","type":"FunctionExpression","value":"function"},"vars":{"self":null,"self._ready":null}},"summary":"Call inside the publish function. Informs the subscriber that an initial, complete snapshot of the record set has been sent. This will trigger a call on the client to the `onReady` callback passed to [`Meteor.subscribe`](#meteor_subscribe), if any.","tags":[{"originalTitle":"locus","title":"locus","text":"Server","value":"Server"}],"memberof":"Subscription","scope":"instance","name":"ready","longname":"Subscription#ready","kind":"function","___id":"T000002R052653","___s":true,"options":[],"params":[],"locus":"Server"},"EJSON":{"newBinary":{"meta":{"range":[1470,1769],"filename":"base64.js","lineno":70,"path":"/Users/sashko/git/meteor/packages/ejson","code":{"id":"astnode100302934","name":"EJSON.newBinary","type":"FunctionExpression","value":"function","paramnames":["len"]},"vars":{"ret":null,"i":null,"ret.$Uint8ArrayPolyfill":null}},"summary":"Allocate a new buffer of binary data that EJSON can serialize.","tags":[{"originalTitle":"locus","title":"locus","text":"Anywhere","value":"Anywhere"}],"params":[{"type":{"names":["Number"]},"description":"The number of bytes of binary data to allocate.
","name":"size"}],"name":"newBinary","longname":"EJSON.newBinary","kind":"function","memberof":"EJSON","scope":"static","___id":"T000002R053658","___s":true,"options":[],"locus":"Anywhere"},"addType":{"meta":{"range":[1156,1321],"filename":"ejson.js","lineno":24,"path":"/Users/sashko/git/meteor/packages/ejson","code":{"id":"astnode100303784","name":"EJSON.addType","type":"FunctionExpression","value":"function","paramnames":["name","factory"]},"vars":{"customTypes[undefined]":null}},"summary":"Add a custom datatype to EJSON.","tags":[{"originalTitle":"locus","title":"locus","text":"Anywhere","value":"Anywhere"}],"params":[{"type":{"names":["String"]},"description":"A tag for your custom type; must be unique among custom data types defined in your project, and must match the result of your type's typeName method.
A function that deserializes a JSON-compatible value into an instance of your type. This should match the serialization performed by your type's toJSONValue method.
A value to serialize to plain JSON.
","name":"val"}],"name":"toJSONValue","longname":"EJSON.toJSONValue","kind":"function","memberof":"EJSON","scope":"static","___id":"T000002R053789","___s":true,"options":[],"locus":"Anywhere"},"fromJSONValue":{"meta":{"range":[7910,8166],"filename":"ejson.js","lineno":262,"path":"/Users/sashko/git/meteor/packages/ejson","code":{"id":"astnode100304599","name":"EJSON.fromJSONValue","type":"FunctionExpression","value":"function","paramnames":["item"]},"vars":{"changed":null,"item":null}},"summary":"Deserialize an EJSON value from its plain JSON representation.","tags":[{"originalTitle":"locus","title":"locus","text":"Anywhere","value":"Anywhere"}],"params":[{"type":{"names":["JSONCompatible"]},"description":"A value to deserialize into EJSON.
","name":"val"}],"name":"fromJSONValue","longname":"EJSON.fromJSONValue","kind":"function","memberof":"EJSON","scope":"static","___id":"T000002R053800","___s":true,"options":[],"locus":"Anywhere"},"stringify":{"meta":{"range":[8794,9037],"filename":"ejson.js","lineno":283,"path":"/Users/sashko/git/meteor/packages/ejson","code":{"id":"astnode100304640","name":"EJSON.stringify","type":"FunctionExpression","value":"function","paramnames":["item","options"]},"vars":{"json":null}},"summary":"Serialize a value to a string.\n\nFor EJSON values, the serialization fully represents the value. For non-EJSON values, serializes the same way as `JSON.stringify`.","tags":[{"originalTitle":"locus","title":"locus","text":"Anywhere","value":"Anywhere"}],"params":[{"type":{"names":["EJSON"]},"description":"A value to stringify.
","name":"val"},{"type":{"names":["Object"]},"optional":true,"name":"options"}],"name":"stringify","longname":"EJSON.stringify","kind":"function","memberof":"EJSON","scope":"static","___id":"T000002R053803","___s":true,"options":[{"type":{"names":["Boolean","Integer","String"]},"description":"Indents objects and arrays for easy readability. When true, indents by 2 spaces; when an integer, indents by that number of spaces; and when a string, uses the string as the indentation pattern.
When true, stringifies keys in an object in sorted order.
A string to parse into an EJSON value.
","name":"str"}],"name":"parse","longname":"EJSON.parse","kind":"function","memberof":"EJSON","scope":"static","___id":"T000002R053805","___s":true,"options":[],"locus":"Anywhere"},"isBinary":{"meta":{"range":[9595,9749],"filename":"ejson.js","lineno":308,"path":"/Users/sashko/git/meteor/packages/ejson","code":{"id":"astnode100304709","name":"EJSON.isBinary","type":"FunctionExpression","value":"function","paramnames":["obj"]}},"summary":"Returns true if `x` is a buffer of binary data, as returned from [`EJSON.newBinary`](#ejson_new_binary).","params":[{"type":{"names":["Object"]},"description":"The variable to check.
","name":"x"}],"tags":[{"originalTitle":"locus","title":"locus","text":"Anywhere","value":"Anywhere"}],"name":"isBinary","longname":"EJSON.isBinary","kind":"function","memberof":"EJSON","scope":"static","___id":"T000002R053806","___s":true,"options":[],"locus":"Anywhere"},"equals":{"meta":{"range":[10268,12522],"filename":"ejson.js","lineno":321,"path":"/Users/sashko/git/meteor/packages/ejson","code":{"id":"astnode100304734","name":"EJSON.equals","type":"FunctionExpression","value":"function","paramnames":["a","b","options"]},"vars":{"i":null,"keyOrderSensitive":null,"ret":null,"bKeys":null,"":null}},"summary":"Return true if `a` and `b` are equal to each other. Return false otherwise. Uses the `equals` method on `a` if present, otherwise performs a deep comparison.","tags":[{"originalTitle":"locus","title":"locus","text":"Anywhere","value":"Anywhere"}],"params":[{"type":{"names":["EJSON"]},"name":"a"},{"type":{"names":["EJSON"]},"name":"b"},{"type":{"names":["Object"]},"optional":true,"name":"options"}],"name":"equals","longname":"EJSON.equals","kind":"function","memberof":"EJSON","scope":"static","___id":"T000002R053807","___s":true,"options":[{"type":{"names":["Boolean"]},"description":"Compare in key sensitive order, if supported by the JavaScript implementation. For example, {a: 1, b: 2} is equal to {b: 2, a: 1} only when keyOrderSensitive is false. The default is false.
A value to copy.
","name":"val"}],"name":"clone","longname":"EJSON.clone","kind":"function","memberof":"EJSON","scope":"static","___id":"T000002R053818","___s":true,"options":[],"locus":"Anywhere"}},"HTTP":{"call":{"meta":{"range":[1471,6304],"filename":"httpcall_client.js","lineno":17,"path":"/Users/sashko/git/meteor/packages/http","code":{"id":"astnode100341477","name":"HTTP.call","type":"FunctionExpression","value":"function","paramnames":["method","url","options","callback"]},"vars":{"callback":null,"options":null,"method":null,"headers":null,"content":null,"headers['Content-Type']":null,"params_for_url":null,"params_for_body":null,"query_match":null,"url":null,"username":null,"password":null,"colonLoc":null,"":null,"xhr":null,"k":null,"timed_out":null,"timer":null,"xhr.onreadystatechange":null}},"summary":"Perform an outbound HTTP request.","tags":[{"originalTitle":"locus","title":"locus","text":"Anywhere","value":"Anywhere"}],"params":[{"type":{"names":["String"]},"description":"The HTTP method to use, such as "GET", "POST", or "HEAD".
The URL to retrieve.
","name":"url"},{"type":{"names":["Object"]},"optional":true,"name":"options"},{"type":{"names":["function"]},"optional":true,"description":"Optional callback. If passed, the method runs asynchronously, instead of synchronously, and calls asyncCallback. On the client, this callback is required.
","name":"asyncCallback"}],"name":"call","longname":"HTTP.call","kind":"function","memberof":"HTTP","scope":"static","___id":"T000002R062253","___s":true,"options":[{"type":{"names":["String"]},"description":"String to use as the HTTP request body.
","name":"content"},{"type":{"names":["Object"]},"description":"JSON-able object to stringify and use as the HTTP request body. Overwrites content.
Query string to go in the URL. Overwrites any query string in url.
Dictionary of request parameters to be encoded and placed in the URL (for GETs) or request body (for POSTs). If content or data is specified, params will always be placed in the URL.
HTTP basic authentication string of the form "username:password"
Dictionary of strings, headers to add to the HTTP request.
","name":"headers"},{"type":{"names":["Number"]},"description":"Maximum time in milliseconds to wait for the request before failing. There is no timeout by default.
","name":"timeout"},{"type":{"names":["Boolean"]},"description":"If true, transparently follow HTTP redirects. Cannot be set to false on the client. Default true.
The key to set, eg, selectedItem
The new value for key
The key to set, eg, selectedItem
The new value for key
The name of the session variable to return
","name":"key"}],"scope":"static","longname":"Session.get","___id":"T000002R072610","___s":true,"options":[],"locus":"Client"},"equals":{"meta":{"range":[1528,1937],"filename":"session.js","lineno":38,"path":"/Users/sashko/git/meteor/packages/session","code":{}},"memberof":"Session","kind":"function","name":"equals","summary":"Test if a session variable is equal to a value. If inside a [reactive computation](#reactivity), invalidate the computation the next time the variable changes to or from the value.","tags":[{"originalTitle":"locus","title":"locus","text":"Client","value":"Client"}],"params":[{"type":{"names":["String"]},"description":"The name of the session variable to test
","name":"key"},{"type":{"names":["String","Number","Boolean","null","undefined"]},"description":"The value to test against
","name":"value"}],"scope":"static","longname":"Session.equals","___id":"T000002R072614","___s":true,"options":[],"locus":"Client"}},"Subscription":{"meta":{"range":[27224,27324],"filename":"livedata_server.js","lineno":853,"path":"/Users/sashko/git/meteor/packages/ddp","code":{}},"summary":"The server's side of a subscription","kind":"class","name":"Subscription","tags":[{"originalTitle":"instanceName","title":"instancename","text":"this","value":"this"}],"longname":"Subscription","___id":"T000002R052595","___s":true,"options":[],"params":[],"instancename":"this"}}; \ No newline at end of file diff --git a/docs/client/packages/appcache.html b/docs/client/packages/appcache.html index 3163e5cadb..67addde864 100644 --- a/docs/client/packages/appcache.html +++ b/docs/client/packages/appcache.html @@ -24,7 +24,7 @@ caching simply add the `appcache` package to your project. (Note however that the `appcache` package by itself doesn't make *data* available offline: in an application loaded offline, a Meteor Collection will appear to be empty in the client until the Internet -becomes available and the browser is able to establish a livedata +becomes available and the browser is able to establish a DDP connection). The application cache works transparently in all supported browsers diff --git a/meteor b/meteor index 58a87b8fc9..de339fdc17 100755 --- a/meteor +++ b/meteor @@ -1,6 +1,6 @@ #!/bin/bash -BUNDLE_VERSION=0.3.51 +BUNDLE_VERSION=0.3.50 # OS Check. Put here because here is where we download the precompiled # bundles that are arch specific. diff --git a/packages/accounts-base/accounts_client.js b/packages/accounts-base/accounts_client.js index 62948cd246..f4e9e71469 100644 --- a/packages/accounts-base/accounts_client.js +++ b/packages/accounts-base/accounts_client.js @@ -292,6 +292,46 @@ Accounts.loginServicesConfigured = function () { return loginServicesHandle.ready(); }; +// Some login services such as the redirect login flow or the resume +// login handler can log the user in at page load time. The +// Meteor.loginWithX functions have a callback argument, but the +// callback function instance won't be in memory any longer if the +// page was reloaded. The `onPageLoadLogin` function allows a +// callback to be registered for the case where the login was +// initiated in a previous VM, and we now have the result of the login +// attempt in a new VM. + +var pageLoadLoginCallbacks = []; +var pageLoadLoginAttemptInfo = null; + +// Register a callback to be called if we have information about a +// login attempt at page load time. Call the callback immediately if +// we already have the page load login attempt info, otherwise stash +// the callback to be called if and when we do get the attempt info. +// +Accounts.onPageLoadLogin = function (f) { + if (pageLoadLoginAttemptInfo) + f(pageLoadLoginAttemptInfo); + else + pageLoadLoginCallbacks.push(f); +}; + + +// Receive the information about the login attempt at page load time. +// Call registered callbacks, and also record the info in case +// someone's callback hasn't been registered yet. +// +Accounts._pageLoadLogin = function (attemptInfo) { + if (pageLoadLoginAttemptInfo) { + Meteor._debug("Ignoring unexpected duplicate page load login attempt info"); + return; + } + _.each(pageLoadLoginCallbacks, function (callback) { callback(attemptInfo); }); + pageLoadLoginCallbacks = []; + pageLoadLoginAttemptInfo = attemptInfo; +}; + + /// /// HANDLEBARS HELPERS /// diff --git a/packages/accounts-base/localstorage_token.js b/packages/accounts-base/localstorage_token.js index 2fa0fbdfd9..91d93de79b 100644 --- a/packages/accounts-base/localstorage_token.js +++ b/packages/accounts-base/localstorage_token.js @@ -100,6 +100,16 @@ if (autoLoginEnabled) { Meteor._debug("Error logging in with token: " + err); makeClientLoggedOut(); } + Accounts._pageLoadLogin({ + type: "resume", + allowed: !err, + error: err, + methodName: "login", + // XXX This is duplicate code with loginWithToken, but + // loginWithToken can also be called at other times besides + // page load. + methodArguments: [{resume: token}] + }); }); } } diff --git a/packages/accounts-base/package.js b/packages/accounts-base/package.js index 15e1e1f936..3c5535f24e 100644 --- a/packages/accounts-base/package.js +++ b/packages/accounts-base/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "A user account system", - version: "1.0.0" + version: "1.0.1-rc0" }); Package.on_use(function (api) { @@ -17,11 +17,11 @@ Package.on_use(function (api) { api.use('service-configuration', ['client', 'server'], { unordered: true }); // needed for getting the currently logged-in user - api.use('livedata', ['client', 'server']); + api.use('ddp', ['client', 'server']); // need this because of the Meteor.users collection but in the future // we'd probably want to abstract this away - api.use('mongo-livedata', ['client', 'server']); + api.use('mongo', ['client', 'server']); // If the 'blaze' package is loaded, we'll define some helpers like // {{currentUser}}. If not, no biggie. diff --git a/packages/accounts-oauth/oauth_client.js b/packages/accounts-oauth/oauth_client.js index 5b8406c616..e6d1499079 100644 --- a/packages/accounts-oauth/oauth_client.js +++ b/packages/accounts-oauth/oauth_client.js @@ -1,3 +1,52 @@ +// Allow server to specify a specify subclass of errors. We should come +// up with a more generic way to do this! +var convertError = function (err) { + if (err && err instanceof Meteor.Error && + err.error === Accounts.LoginCancelledError.numericError) + return new Accounts.LoginCancelledError(err.reason); + else + return err; +}; + + +// For the redirect login flow, the final step is that we're +// redirected back to the application. The credentialToken for this +// login attempt is stored in the reload migration data, and the +// credentialSecret for a successful login is stored in session +// storage. + +Meteor.startup(function () { + var oauth = OAuth.getDataAfterRedirect(); + if (! oauth) + return; + + // We'll only have the credentialSecret if the login completed + // successfully. However we still call the login method anyway to + // retrieve the error if the login was unsuccessful. + + var methodName = 'login'; + var methodArguments = [{oauth: _.pick(oauth, 'credentialToken', 'credentialSecret')}]; + + Accounts.callLoginMethod({ + methodArguments: methodArguments, + userCallback: function (err) { + // The redirect login flow is complete. Construct an + // `attemptInfo` object with the login result, and report back + // to the code which initiated the login attempt + // (e.g. accounts-ui, when that package is being used). + err = convertError(err); + Accounts._pageLoadLogin({ + type: oauth.loginService, + allowed: !err, + error: err, + methodName: methodName, + methodArguments: methodArguments + }); + } + }); +}); + + // Send an OAuth login method to the server. If the user authorized // access in the popup this should log the user in, otherwise // nothing should happen. @@ -9,14 +58,7 @@ Accounts.oauth.tryLoginAfterPopupClosed = function(credentialToken, callback) { credentialSecret: credentialSecret }}], userCallback: callback && function (err) { - // Allow server to specify a specify subclass of errors. We should come - // up with a more generic way to do this! - if (err && err instanceof Meteor.Error && - err.error === Accounts.LoginCancelledError.numericError) { - callback(new Accounts.LoginCancelledError(err.reason)); - } else { - callback(err); - } + callback(convertError(err)); }}); }; diff --git a/packages/accounts-password/package.js b/packages/accounts-password/package.js index c12bb0dbd4..a145d3fd2f 100644 --- a/packages/accounts-password/package.js +++ b/packages/accounts-password/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Password support for accounts", - version: "1.0.0" + version: "1.0.1-rc0" }); Package.on_use(function(api) { @@ -15,7 +15,7 @@ Package.on_use(function(api) { api.use('random', ['server']); api.use('check'); api.use('underscore'); - api.use('livedata', ['client', 'server']); + api.use('ddp', ['client', 'server']); api.add_files('email_templates.js', 'server'); api.add_files('password_server.js', 'server'); @@ -25,7 +25,7 @@ Package.on_use(function(api) { Package.on_test(function(api) { api.use(['accounts-password', 'tinytest', 'test-helpers', 'tracker', 'accounts-base', 'random', 'email', 'underscore', 'check', - 'livedata']); + 'ddp']); api.add_files('password_tests_setup.js', 'server'); api.add_files('password_tests.js', ['client', 'server']); api.add_files('email_tests_setup.js', 'server'); diff --git a/packages/accounts-ui-unstyled/login_buttons_dialogs.html b/packages/accounts-ui-unstyled/login_buttons_dialogs.html index 85708f673b..e4378c9d57 100644 --- a/packages/accounts-ui-unstyled/login_buttons_dialogs.html +++ b/packages/accounts-ui-unstyled/login_buttons_dialogs.html @@ -103,6 +103,16 @@ {{/each}} ++ Choose the login style: +
+
+
+
+
+
+
+
I'll do this later
diff --git a/packages/accounts-ui-unstyled/login_buttons_dialogs.js b/packages/accounts-ui-unstyled/login_buttons_dialogs.js
index e73aa15625..893a1290ce 100644
--- a/packages/accounts-ui-unstyled/login_buttons_dialogs.js
+++ b/packages/accounts-ui-unstyled/login_buttons_dialogs.js
@@ -189,6 +189,10 @@ Template._configureLoginServiceDialog.events({
.replace(/^\s*|\s*$/g, ""); // trim() doesnt work on IE8;
});
+ configuration.loginStyle =
+ $('#configure-login-service-dialog input[name="loginStyle"]:checked')
+ .val();
+
// Configure this login service
Accounts.connection.call(
"configureLoginService", configuration, function (error, result) {
diff --git a/packages/accounts-ui-unstyled/login_buttons_single.js b/packages/accounts-ui-unstyled/login_buttons_single.js
index 96e1e65624..35d09c9f28 100644
--- a/packages/accounts-ui-unstyled/login_buttons_single.js
+++ b/packages/accounts-ui-unstyled/login_buttons_single.js
@@ -1,21 +1,37 @@
// for convenience
var loginButtonsSession = Accounts._loginButtonsSession;
+
+var loginResultCallback = function (serviceName, err) {
+ if (!err) {
+ loginButtonsSession.closeDropdown();
+ } else if (err instanceof Accounts.LoginCancelledError) {
+ // do nothing
+ } else if (err instanceof ServiceConfiguration.ConfigError) {
+ loginButtonsSession.configureService(serviceName);
+ } else {
+ loginButtonsSession.errorMessage(err.reason || "Unknown error");
+ }
+};
+
+
+// In the login redirect flow, we'll have the result of the login
+// attempt at page load time when we're redirected back to the
+// application. Register a callback to update the UI (i.e. to close
+// the dialog on a successful login or display the error on a failed
+// login).
+//
+Accounts.onPageLoadLogin(function (attemptInfo) {
+ // Ignore if we have a left over login attempt for a service that is no longer registered.
+ if (_.contains(_.pluck(getLoginServices(), "name"), attemptInfo.type))
+ loginResultCallback(attemptInfo.type, attemptInfo.err);
+});
+
+
Template._loginButtonsLoggedOutSingleLoginButton.events({
'click .login-button': function () {
var serviceName = this.name;
loginButtonsSession.resetMessages();
- var callback = function (err) {
- if (!err) {
- loginButtonsSession.closeDropdown();
- } else if (err instanceof Accounts.LoginCancelledError) {
- // do nothing
- } else if (err instanceof ServiceConfiguration.ConfigError) {
- loginButtonsSession.configureService(serviceName);
- } else {
- loginButtonsSession.errorMessage(err.reason || "Unknown error");
- }
- };
// XXX Service providers should be able to specify their
// `Meteor.loginWithX` method name.
@@ -32,7 +48,9 @@ Template._loginButtonsLoggedOutSingleLoginButton.events({
if (Accounts.ui._options.forceApprovalPrompt[serviceName])
options.forceApprovalPrompt = Accounts.ui._options.forceApprovalPrompt[serviceName];
- loginWithService(options, callback);
+ loginWithService(options, function (err) {
+ loginResultCallback(serviceName, err);
+ });
}
});
diff --git a/packages/accounts-ui-unstyled/package.js b/packages/accounts-ui-unstyled/package.js
index f96f2b0c40..2b0efe26ee 100644
--- a/packages/accounts-ui-unstyled/package.js
+++ b/packages/accounts-ui-unstyled/package.js
@@ -1,6 +1,6 @@
Package.describe({
summary: "Unstyled version of login widgets",
- version: "1.0.0"
+ version: "1.0.1-rc0"
});
Package.on_use(function (api) {
diff --git a/packages/accounts-ui/login_buttons.less b/packages/accounts-ui/login_buttons.less
index aeb1104564..8738822fca 100644
--- a/packages/accounts-ui/login_buttons.less
+++ b/packages/accounts-ui/login_buttons.less
@@ -265,7 +265,7 @@
margin-top: 7px;
margin-bottom: -2px;
}
- input {
+ input[type=text] {
// Be pixel-accurate in IE 8+ regardless of our borders and
// paddings, at the expense of IE 7.
// Any heights or widths applied to this element will set the
@@ -356,7 +356,7 @@
margin-top: -220px; /* = approximately -height/2, though height can change */
table { width: 100%; }
- input {
+ input[type=text] {
width: 100%;
font-family: "Courier New", Courier, monospace;
}
diff --git a/packages/appcache/appcache-server.js b/packages/appcache/appcache-server.js
index b5e379cf3d..4d26d2ebce 100644
--- a/packages/appcache/appcache-server.js
+++ b/packages/appcache/appcache-server.js
@@ -89,7 +89,7 @@ WebApp.connectHandlers.use(function(req, res, next) {
manifest += "CACHE:" + "\n";
manifest += "/" + "\n";
- _.each(WebApp.clientProgram.manifest, function (resource) {
+ _.each(WebApp.clientPrograms[WebApp.defaultArch].manifest, function (resource) {
if (resource.where === 'client' &&
! RoutePolicy.classify(resource.url)) {
manifest += resource.url;
@@ -118,7 +118,7 @@ WebApp.connectHandlers.use(function(req, res, next) {
// request to the server and have the asset served from cache by
// specifying the full URL with hash in their code (manually, with
// some sort of URL rewriting helper)
- _.each(WebApp.clientProgram.manifest, function (resource) {
+ _.each(WebApp.clientPrograms[WebApp.defaultArch].manifest, function (resource) {
if (resource.where === 'client' &&
! RoutePolicy.classify(resource.url) &&
!resource.cacheable) {
@@ -154,7 +154,7 @@ WebApp.connectHandlers.use(function(req, res, next) {
var sizeCheck = function() {
var totalSize = 0;
- _.each(WebApp.clientProgram.manifest, function (resource) {
+ _.each(WebApp.clientPrograms[WebApp.defaultArch].manifest, function (resource) {
if (resource.where === 'client' &&
! RoutePolicy.classify(resource.url)) {
totalSize += resource.size;
diff --git a/packages/appcache/package.js b/packages/appcache/package.js
index da924c9bbc..8c0dd8bcfc 100644
--- a/packages/appcache/package.js
+++ b/packages/appcache/package.js
@@ -1,6 +1,6 @@
Package.describe({
summary: "Enable the application cache in the browser",
- version: "1.0.0"
+ version: "1.0.0-cordova1"
});
Package.on_use(function (api) {
diff --git a/packages/application-configuration/package.js b/packages/application-configuration/package.js
index d193f564c0..e763a1624e 100644
--- a/packages/application-configuration/package.js
+++ b/packages/application-configuration/package.js
@@ -4,8 +4,8 @@ Package.describe({
});
Package.on_use(function (api) {
- api.use(['logging', 'underscore', 'livedata', 'ejson', 'follower-livedata']);
- api.use(['mongo-livedata'], {
+ api.use(['logging', 'underscore', 'ddp', 'ejson', 'follower-livedata']);
+ api.use(['mongo'], {
unordered: true
});
api.add_files(['config.js'], 'server');
diff --git a/packages/autoupdate/autoupdate_cordova.js b/packages/autoupdate/autoupdate_cordova.js
new file mode 100644
index 0000000000..4dc76e8683
--- /dev/null
+++ b/packages/autoupdate/autoupdate_cordova.js
@@ -0,0 +1,160 @@
+var autoupdateVersionCordova = __meteor_runtime_config__.autoupdateVersionCordova || "unknown";
+
+// The collection of acceptable client versions.
+ClientVersions = new Meteor.Collection("meteor_autoupdate_clientVersions");
+
+Autoupdate = {};
+
+Autoupdate.newClientAvailable = function () {
+ return !! ClientVersions.findOne({
+ _id: 'version-cordova',
+ version: {$ne: autoupdateVersionCordova}
+ });
+};
+
+var writeFile = function (directoryPath, fileName, content, cb) {
+ var fail = function (err) {
+ cb(new Error("Failed to write file: ", err), null);
+ };
+ window.resolveLocalFileSystemURL(directoryPath,
+ function (dirEntry) {
+ var success = function (fileEntry) {
+ fileEntry.createWriter(function (writer) {
+ writer.onwrite = function (evt) {
+ var result = evt.target.result;
+ cb(null, result);
+ };
+ writer.onerror = fail;
+ writer.write(content);
+ }, fail);
+ };
+
+ dirEntry.getFile(fileName, { create: true, exclusive: false },
+ success, fail);
+ }, fail);
+};
+
+var hasCalledReload = false;
+var onNewVersion = function () {
+ var ft = new FileTransfer();
+ var urlPrefix = Meteor.absoluteUrl() + 'cordova';
+
+ var localPathPrefix = cordova.file.applicationStorageDirectory +
+ 'Documents/meteor/';
+
+
+ HTTP.get(urlPrefix + '/manifest.json', function (err, res) {
+ if (err || ! res.data) {
+ console.log('failed to download the manifest ' + (err && err.message) + ' ' + (res && res.content));
+ return;
+ }
+
+ var program = res.data;
+ var manifest = program.manifest;
+ var version = program.version;
+ var ft = new FileTransfer();
+ var downloads = 0;
+ _.each(manifest, function (item) {
+ if (item.url) downloads++;
+ });
+
+ var versionPrefix = localPathPrefix + version;
+
+ var afterAllFilesDownloaded = _.after(downloads, function () {
+ writeFile(versionPrefix, 'manifest.json',
+ JSON.stringify(program, undefined, 2),
+ function (err) {
+
+ if (err) {
+ console.log("Failed to write manifest.json");
+ // XXX do something smarter?
+ return;
+ }
+
+ // success! downloaded all sources and saved the manifest
+ // save the version string for atomicity
+ writeFile(localPathPrefix, 'version', version,
+ function (err) {
+ if (err) {
+ console.log("Failed to write version");
+ return;
+ }
+
+ // don't call reload twice!
+ if (! hasCalledReload) {
+ Package.reload.Reload._reload();
+ }
+ });
+ });
+ });
+
+ _.each(manifest, function (item) {
+ if (! item.url) return;
+
+ // Add a cache buster to ensure that we don't cache an old asset.
+ var uri = encodeURI(urlPrefix + item.url + '?' + Random.id());
+
+ // Try to dowload the file a few times.
+ var tries = 0;
+ var tryDownload = function () {
+ ft.download(uri, versionPrefix + item.url, function (entry) {
+ if (entry) {
+ afterAllFilesDownloaded();
+ }
+ }, function (err) {
+ // It failed, try again if we have tried less than 5 times.
+ if (tries++ < 5) {
+ tryDownload();
+ } else {
+ console.log('fail source: ', error.source);
+ console.log('fail target: ', error.target);
+ }
+ });
+ };
+
+ tryDownload();
+ });
+ });
+};
+
+var retry = new Retry({
+ minCount: 0, // don't do any immediate retries
+ baseTimeout: 30*1000 // start with 30s
+});
+var failures = 0;
+
+Autoupdate._retrySubscription = function () {
+ Meteor.subscribe("meteor_autoupdate_clientVersions", {
+ onError: function (error) {
+ Meteor._debug("autoupdate subscription failed:", error);
+ failures++;
+ retry.retryLater(failures, function () {
+ // Just retry making the subscription, don't reload the whole
+ // page. While reloading would catch more cases (for example,
+ // the server went back a version and is now doing old-style hot
+ // code push), it would also be more prone to reload loops,
+ // which look really bad to the user. Just retrying the
+ // subscription over DDP means it is at least possible to fix by
+ // updating the server.
+ Autoupdate._retrySubscription();
+ });
+ }
+ });
+ if (Package.reload) {
+ var checkNewVersionDocument = function (doc) {
+ var self = this;
+ if (doc.version !== autoupdateVersionCordova) {
+ onNewVersion();
+ }
+ };
+
+ var handle = ClientVersions.find({
+ _id: 'version-cordova'
+ }).observe({
+ added: checkNewVersionDocument,
+ changed: checkNewVersionDocument
+ });
+ }
+};
+
+Meteor.startup(Autoupdate._retrySubscription);
diff --git a/packages/autoupdate/autoupdate_server.js b/packages/autoupdate/autoupdate_server.js
index 7277c047e2..e294c94b33 100644
--- a/packages/autoupdate/autoupdate_server.js
+++ b/packages/autoupdate/autoupdate_server.js
@@ -51,6 +51,7 @@ ClientVersions = new Meteor.Collection("meteor_autoupdate_clientVersions",
// startup.
Autoupdate.autoupdateVersion = null;
Autoupdate.autoupdateVersionRefreshable = null;
+Autoupdate.autoupdateVersionCordova = null;
var syncQueue = new Meteor._SynchronousQueue();
@@ -59,7 +60,7 @@ var updateVersions = function (shouldReloadClientProgram) {
// Step 1: load the current client program on the server and update the
// hash values in __meteor_runtime_config__.
if (shouldReloadClientProgram) {
- WebAppInternals.reloadClientProgram();
+ WebAppInternals.reloadClientPrograms();
}
// If we just re-read the client program, or if we don't have an autoupdate
@@ -81,6 +82,12 @@ var updateVersions = function (shouldReloadClientProgram) {
process.env.SERVER_ID || // XXX COMPAT 0.6.6
WebApp.calculateClientHashRefreshable();
+ Autoupdate.autoupdateVersionCordova =
+ __meteor_runtime_config__.autoupdateVersionCordova =
+ process.env.AUTOUPDATE_VERSION ||
+ process.env.SERVER_ID || // XXX COMPAT 0.6.6
+ WebApp.calculateClientHashCordova();
+
// Step 2: form the new client boilerplate which contains the updated
// assets and __meteor_runtime_config__.
if (shouldReloadClientProgram) {
@@ -116,6 +123,18 @@ var updateVersions = function (shouldReloadClientProgram) {
ClientVersions.update("version-refreshable", { $set: {
version: Autoupdate.autoupdateVersionRefreshable,
assets: WebAppInternals.refreshableAssets
+ }});
+ }
+
+ if (! ClientVersions.findOne({_id: "version-cordova"})) {
+ ClientVersions.insert({
+ _id: "version-cordova",
+ version: Autoupdate.autoupdateVersionCordova,
+ refreshable: false
+ });
+ } else {
+ ClientVersions.update("version-cordova", { $set: {
+ version: Autoupdate.autoupdateVersionCordova
}});
}
};
diff --git a/packages/autoupdate/package.js b/packages/autoupdate/package.js
index 4ec8eb1456..50e9802d04 100644
--- a/packages/autoupdate/package.js
+++ b/packages/autoupdate/package.js
@@ -1,16 +1,23 @@
Package.describe({
summary: "Update the client when new client code is available",
- version: '1.0.5'
+ version: '1.0.7-cordova6'
+});
+
+Cordova.depends({
+ 'org.apache.cordova.file': '1.3.0',
+ 'org.apache.cordova.file-transfer': '0.4.4'
});
Package.on_use(function (api) {
api.use('webapp', 'server');
api.use(['tracker', 'retry'], 'client');
- api.use(['livedata', 'mongo-livedata', 'underscore'], ['client', 'server']);
+ api.use(['ddp', 'mongo', 'underscore'], ['client', 'server']);
api.use('tracker', 'client');
api.use('reload', 'client', {weak: true});
+ api.use('http', 'web.cordova');
api.export('Autoupdate');
api.add_files('autoupdate_server.js', 'server');
- api.add_files('autoupdate_client.js', 'client');
+ api.add_files('autoupdate_client.js', 'web.browser');
+ api.add_files('autoupdate_cordova.js', 'web.cordova');
});
diff --git a/packages/blaze/package.js b/packages/blaze/package.js
index 9e07459cee..3255614f59 100644
--- a/packages/blaze/package.js
+++ b/packages/blaze/package.js
@@ -1,6 +1,6 @@
Package.describe({
summary: "Meteor Reactive Templating library",
- version: '1.0.3'
+ version: '2.0.0-rc0'
});
Package.on_use(function (api) {
diff --git a/packages/boilerplate-generator/.gitignore b/packages/boilerplate-generator/.gitignore
new file mode 100644
index 0000000000..677a6fc263
--- /dev/null
+++ b/packages/boilerplate-generator/.gitignore
@@ -0,0 +1 @@
+.build*
diff --git a/packages/boilerplate-generator/boilerplate-generator.js b/packages/boilerplate-generator/boilerplate-generator.js
new file mode 100644
index 0000000000..a3c085642e
--- /dev/null
+++ b/packages/boilerplate-generator/boilerplate-generator.js
@@ -0,0 +1,102 @@
+var fs = Npm.require('fs');
+var Future = Npm.require('fibers/future');
+var path = Npm.require('path');
+
+// Copied from webapp_server
+var readUtf8FileSync = function (filename) {
+ return Future.wrap(fs.readFile)(filename, 'utf8').wait();
+};
+
+Boilerplate = function (arch, manifest, options) {
+ var self = this;
+ options = options || {};
+ self.template = _getTemplate(arch);
+ self.baseData = null;
+ self.func = null;
+
+ self._generateBoilerplateFromManifestAndSource(
+ manifest,
+ self.template,
+ options
+ );
+};
+
+Boilerplate.prototype.toHTML = function () {
+ var self = this;
+
+ if (! self.baseData || ! self.func)
+ throw new Error('Boilerplate did not instantiate correctly.');
+
+ return "\n" +
+ Blaze.toHTML(Blaze.With(self.baseData,
+ self.func));
+};
+
+// XXX Exported to allow client-side only changes to rebuild the boilerplate
+// without requiring a full server restart.
+// Produces an HTML string with given manifest and boilerplateSource.
+// Optionally takes urlMapper in case urls from manifest need to be prefixed
+// or rewritten.
+// Optionally takes pathMapper for resolving relative file system paths.
+// Optionally allows to override fields of the data context.
+Boilerplate.prototype._generateBoilerplateFromManifestAndSource =
+ function (manifest, boilerplateSource, options) {
+ var self = this;
+ // map to the identity by default
+ var urlMapper = options.urlMapper || _.identity;
+ var pathMapper = options.pathMapper || _.identity;
+
+ var boilerplateBaseData = {
+ css: [],
+ js: [],
+ head: '',
+ body: '',
+ meteorManifest: JSON.stringify(manifest)
+ };
+
+ // allow the caller to extend the default base data
+ _.extend(boilerplateBaseData, options.baseDataExtension);
+
+ _.each(manifest, function (item) {
+ var urlPath = urlMapper(item.url);
+ var itemObj = { url: urlPath };
+
+ if (options.inline) {
+ itemObj.scriptContent = readUtf8FileSync(
+ pathMapper(item.path));
+ itemObj.inline = true;
+ }
+
+ if (item.type === 'css' && item.where === 'client') {
+ boilerplateBaseData.css.push(itemObj);
+ }
+ if (item.type === 'js' && item.where === 'client') {
+ boilerplateBaseData.js.push(itemObj);
+ }
+ if (item.type === 'head') {
+ boilerplateBaseData.head =
+ readUtf8FileSync(pathMapper(item.path));
+ }
+ if (item.type === 'body') {
+ boilerplateBaseData.body =
+ readUtf8FileSync(pathMapper(item.path));
+ }
+ });
+ var boilerplateRenderCode = SpacebarsCompiler.compile(
+ boilerplateSource, { isBody: true });
+
+ // Note that we are actually depending on eval's local environment capture
+ // so that UI and HTML are visible to the eval'd code.
+ // XXX the template we are evaluating relies on the fact that UI is globally
+ // available.
+ global.UI = UI;
+ self.func = eval(boilerplateRenderCode);
+ self.baseData = boilerplateBaseData;
+};
+
+var _getTemplate = _.memoize(function (arch) {
+ var filename = 'boilerplate_' + arch + '.html';
+ return Assets.getText(filename);
+});
+
+
diff --git a/packages/webapp/boilerplate.html b/packages/boilerplate-generator/boilerplate_web.browser.html
similarity index 100%
rename from packages/webapp/boilerplate.html
rename to packages/boilerplate-generator/boilerplate_web.browser.html
diff --git a/packages/boilerplate-generator/boilerplate_web.cordova.html b/packages/boilerplate-generator/boilerplate_web.cordova.html
new file mode 100644
index 0000000000..6cf5ceeafe
--- /dev/null
+++ b/packages/boilerplate-generator/boilerplate_web.cordova.html
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
+
+
+
+
+ {{{head}}}
+
+
+
+ {{{body}}}
+
+
diff --git a/packages/boilerplate-generator/package.js b/packages/boilerplate-generator/package.js
new file mode 100644
index 0000000000..a3e9a23e3a
--- /dev/null
+++ b/packages/boilerplate-generator/package.js
@@ -0,0 +1,19 @@
+Package.describe({
+ summary: "Generates the boilerplate html from program's manifest",
+ version: '1.0.0-cordova1'
+});
+
+Package.on_use(function (api) {
+ api.use(['underscore', 'spacebars-compiler',
+ 'spacebars', 'htmljs', 'ui'], 'server');
+ api.add_files(['boilerplate-generator.js'], 'server');
+ api.export(['Boilerplate'], 'server');
+ // These are spacebars templates, but we process them manually with the
+ // spacebars compiler rather than letting the 'templating' package (which
+ // isn't fully supported on the server yet) handle it. That also means that
+ // they don't contain the outer "" tag.
+ api.add_files(['boilerplate_web.browser.html',
+ 'boilerplate_web.cordova.html'],
+ 'server', {isAsset: true});
+});
+
diff --git a/packages/bootstrap/package.js b/packages/bootstrap/package.js
index 5775a3c8c3..01401235c4 100644
--- a/packages/bootstrap/package.js
+++ b/packages/bootstrap/package.js
@@ -1,6 +1,6 @@
Package.describe({
summary: "Front-end framework from Twitter",
- version: "1.0.0"
+ version: "1.0.1-rc0"
});
Package.on_use(function (api) {
diff --git a/packages/coffeescript/package.js b/packages/coffeescript/package.js
index c51364044f..f4124cbe3e 100644
--- a/packages/coffeescript/package.js
+++ b/packages/coffeescript/package.js
@@ -1,6 +1,6 @@
Package.describe({
summary: "Javascript dialect with fewer braces and semicolons",
- version: "1.0.2"
+ version: "1.0.2-cordova4"
});
Package._transitional_registerBuildPlugin({
diff --git a/packages/constraint-solver/package.js b/packages/constraint-solver/package.js
index 5d3f573b95..17c72421c7 100644
--- a/packages/constraint-solver/package.js
+++ b/packages/constraint-solver/package.js
@@ -1,6 +1,6 @@
Package.describe({
summary: "Given the set of the constraints, picks a satisfying configuration",
- version: "1.0.10"
+ version: "1.0.12-cordova6"
});
Npm.depends({
diff --git a/packages/ctl-helper/package.js b/packages/ctl-helper/package.js
index eb247cb318..8ac6b7f586 100644
--- a/packages/ctl-helper/package.js
+++ b/packages/ctl-helper/package.js
@@ -6,7 +6,7 @@ Package.describe({
Npm.depends({optimist: '0.6.0'});
Package.on_use(function (api) {
- api.use(['logging', 'underscore', 'livedata', 'mongo-livedata', 'follower-livedata', 'application-configuration'], 'server');
+ api.use(['logging', 'underscore', 'ddp', 'mongo', 'follower-livedata', 'application-configuration'], 'server');
api.export('Ctl', 'server');
api.add_files('ctl-helper.js', 'server');
});
diff --git a/packages/ctl/package.js b/packages/ctl/package.js
index a0d3309249..558f06ed65 100644
--- a/packages/ctl/package.js
+++ b/packages/ctl/package.js
@@ -4,7 +4,7 @@ Package.describe({
});
Package.on_use(function (api) {
- api.use(['underscore', 'livedata', 'mongo-livedata', 'ctl-helper', 'application-configuration', 'follower-livedata'], 'server');
+ api.use(['underscore', 'ddp', 'mongo', 'ctl-helper', 'application-configuration', 'follower-livedata'], 'server');
api.export('main', 'server');
api.add_files('ctl.js', 'server');
});
diff --git a/packages/ddp/.gitignore b/packages/ddp/.gitignore
new file mode 100644
index 0000000000..677a6fc263
--- /dev/null
+++ b/packages/ddp/.gitignore
@@ -0,0 +1 @@
+.build*
diff --git a/packages/livedata/.npm/package/.gitignore b/packages/ddp/.npm/package/.gitignore
similarity index 100%
rename from packages/livedata/.npm/package/.gitignore
rename to packages/ddp/.npm/package/.gitignore
diff --git a/packages/livedata/.npm/package/README b/packages/ddp/.npm/package/README
similarity index 100%
rename from packages/livedata/.npm/package/README
rename to packages/ddp/.npm/package/README
diff --git a/packages/livedata/.npm/package/npm-shrinkwrap.json b/packages/ddp/.npm/package/npm-shrinkwrap.json
similarity index 100%
rename from packages/livedata/.npm/package/npm-shrinkwrap.json
rename to packages/ddp/.npm/package/npm-shrinkwrap.json
diff --git a/packages/livedata/DDP.md b/packages/ddp/DDP.md
similarity index 93%
rename from packages/livedata/DDP.md
rename to packages/ddp/DDP.md
index 0cb9d137f9..249be03c3e 100644
--- a/packages/livedata/DDP.md
+++ b/packages/ddp/DDP.md
@@ -7,7 +7,7 @@ DDP is a protocol between a client and a server that supports two operations:
client informed about the contents of those documents as they change over
time.
-This document specifies the version "pre2" of DDP. It's a rough description of
+This document specifies the version "1" of DDP. It's a rough description of
the protocol and not intended to be entirely definitive.
## General Message Structure:
@@ -21,6 +21,14 @@ DDP messages are JSON objects, with some fields specified to be EJSON. Each one
has a `msg` field that specifies the message type, as well as other fields
depending on message type.
+The client and the server must ignore any unknown fields in messages. Future
+minor revisions of DDP might add extra fields without changing the DDP version;
+the client must therefore silently ignore unknown fields. However, the client
+must not send extra fields other than those documented in the DDP protocol, in
+case these extra fields have meaning to future servers. On the server, all
+field changes must be optional/ignorable for compatability with older clients;
+otherwise a new protocol version would be required.
+
## Establishing a DDP Connection:
### Messages:
@@ -324,3 +332,14 @@ behaves differently to the server, then syncing will fix this.
* If both client and server support randomSeed, in the normal case the ids
generated will be the same, and syncing will be a no-op.
+
+
+## Version History
+
+```pre1``` was the first version of DDP
+
+```pre2``` added keep-alive (ping & pong messages), and randomSeed.
+
+```1``` should be considered the first official version of DDP. It is
+currently identical to pre2, although non-incompatible changes may be made to
+it in future.
diff --git a/packages/livedata/client_convenience.js b/packages/ddp/client_convenience.js
similarity index 100%
rename from packages/livedata/client_convenience.js
rename to packages/ddp/client_convenience.js
diff --git a/packages/livedata/common.js b/packages/ddp/common.js
similarity index 100%
rename from packages/livedata/common.js
rename to packages/ddp/common.js
diff --git a/packages/livedata/crossbar.js b/packages/ddp/crossbar.js
similarity index 100%
rename from packages/livedata/crossbar.js
rename to packages/ddp/crossbar.js
diff --git a/packages/livedata/crossbar_tests.js b/packages/ddp/crossbar_tests.js
similarity index 100%
rename from packages/livedata/crossbar_tests.js
rename to packages/ddp/crossbar_tests.js
diff --git a/packages/livedata/heartbeat.js b/packages/ddp/heartbeat.js
similarity index 100%
rename from packages/livedata/heartbeat.js
rename to packages/ddp/heartbeat.js
diff --git a/packages/livedata/livedata_common.js b/packages/ddp/livedata_common.js
similarity index 96%
rename from packages/livedata/livedata_common.js
rename to packages/ddp/livedata_common.js
index 42e5da117b..1367d8d913 100644
--- a/packages/livedata/livedata_common.js
+++ b/packages/ddp/livedata_common.js
@@ -1,4 +1,6 @@
-SUPPORTED_DDP_VERSIONS = [ 'pre2', 'pre1' ];
+// All the supported versions (for both the client and server)
+// These must be in order of preference; most favored-first
+SUPPORTED_DDP_VERSIONS = [ '1', 'pre2', 'pre1' ];
LivedataTest.SUPPORTED_DDP_VERSIONS = SUPPORTED_DDP_VERSIONS;
diff --git a/packages/livedata/livedata_connection.js b/packages/ddp/livedata_connection.js
similarity index 100%
rename from packages/livedata/livedata_connection.js
rename to packages/ddp/livedata_connection.js
diff --git a/packages/livedata/livedata_connection_tests.js b/packages/ddp/livedata_connection_tests.js
similarity index 97%
rename from packages/livedata/livedata_connection_tests.js
rename to packages/ddp/livedata_connection_tests.js
index dcee7378f7..06cff4b800 100644
--- a/packages/livedata/livedata_connection_tests.js
+++ b/packages/ddp/livedata_connection_tests.js
@@ -1407,6 +1407,40 @@ Tinytest.add("livedata connection - ping with id", function (test) {
testGotMessage(test, stream, {msg: 'pong', id: id});
});
+_.each(LivedataTest.SUPPORTED_DDP_VERSIONS, function (version) {
+ Tinytest.addAsync("livedata connection - ping from " + version,
+ function (test, onComplete) {
+ var connection = new LivedataTest.Connection(getSelfConnectionUrl(), {
+ reloadWithOutstanding: true,
+ supportedDDPVersions: [version],
+ onDDPVersionNegotiationFailure: function () { test.fail(); onComplete(); },
+ onConnected: function () {
+ test.equal(connection._version, version);
+ // It's a little naughty to access _stream and _send, but it works...
+ connection._stream.on('message', function (json) {
+ var msg = JSON.parse(json);
+ var done = false;
+ if (msg.msg === 'pong') {
+ test.notEqual(version, "pre1");
+ done = true;
+ } else if (msg.msg === 'error') {
+ // Version pre1 does not play ping-pong
+ test.equal(version, "pre1");
+ done = true;
+ } else {
+ Meteor._debug("Got unexpected message: " + json);
+ }
+ if (done) {
+ connection._stream.disconnect({_permanent: true});
+ onComplete();
+ }
+ });
+ connection._send({msg: 'ping'});
+ }
+ });
+ });
+});
+
var getSelfConnectionUrl = function () {
if (Meteor.isClient) {
return Meteor._relativeToSiteRootUrl("/");
diff --git a/packages/livedata/livedata_server.js b/packages/ddp/livedata_server.js
similarity index 100%
rename from packages/livedata/livedata_server.js
rename to packages/ddp/livedata_server.js
diff --git a/packages/livedata/livedata_server_tests.js b/packages/ddp/livedata_server_tests.js
similarity index 100%
rename from packages/livedata/livedata_server_tests.js
rename to packages/ddp/livedata_server_tests.js
diff --git a/packages/livedata/livedata_test_service.js b/packages/ddp/livedata_test_service.js
similarity index 100%
rename from packages/livedata/livedata_test_service.js
rename to packages/ddp/livedata_test_service.js
diff --git a/packages/livedata/livedata_tests.js b/packages/ddp/livedata_tests.js
similarity index 100%
rename from packages/livedata/livedata_tests.js
rename to packages/ddp/livedata_tests.js
diff --git a/packages/ddp/package.js b/packages/ddp/package.js
new file mode 100644
index 0000000000..3ffc9a2c83
--- /dev/null
+++ b/packages/ddp/package.js
@@ -0,0 +1,98 @@
+Package.describe({
+ summary: "Meteor's latency-compensated distributed data framework",
+ version: '1.0.7'
+});
+
+// We use 'faye-websocket' for connections in server-to-server DDP, mostly
+// because it's the same library used as a server in sockjs, and it's easiest to
+// deal with a single websocket implementation. (Plus, its maintainer is easy
+// to work with on pull requests.)
+//
+// (By listing faye-websocket first, it's more likely that npm deduplication
+// will prevent a second copy of faye-websocket from being installed inside
+// sockjs.)
+Npm.depends({
+ // A fork fixing https://github.com/faye/websocket-driver-node/pull/8 (ie
+ // "open from inactive client" errors). Note that sockjs won't use this fork,
+ // but the bug only affects the websocket client, not the server.
+ "faye-websocket": "https://github.com/meteor/faye-websocket-node/tarball/ccc180998b1396093c24d0df7ebc1d199c276552",
+ sockjs: "0.3.9"
+});
+
+Package.on_use(function (api) {
+ api.use(['check', 'random', 'ejson', 'json', 'underscore', 'tracker',
+ 'logging', 'retry'],
+ ['client', 'server']);
+
+ // It is OK to use this package on a server architecture without making a
+ // server (in order to do server-to-server DDP as a client). So these are only
+ // included as weak dependencies.
+ // XXX split this package into multiple packages or multiple slices instead
+ api.use(['webapp', 'routepolicy'], 'server', {weak: true});
+
+ // Detect whether or not the user wants us to audit argument checks.
+ api.use(['audit-argument-checks'], 'server', {weak: true});
+
+ // Allow us to detect 'autopublish', so we can print a warning if the user
+ // runs Meteor.publish while it's loaded.
+ api.use('autopublish', 'server', {weak: true});
+
+ // If the facts package is loaded, publish some statistics.
+ api.use('facts', 'server', {weak: true});
+
+ api.use('callback-hook', 'server');
+
+ api.export('DDP');
+ api.export('DDPServer', 'server');
+
+ api.export('LivedataTest', {testOnly: true});
+
+ // Transport
+ api.use('reload', 'client', {weak: true});
+ api.add_files('common.js');
+ api.add_files(['sockjs-0.3.4.js', 'stream_client_sockjs.js'], 'client');
+ api.add_files('stream_client_nodejs.js', 'server');
+ api.add_files('stream_client_common.js', ['client', 'server']);
+ api.add_files('stream_server.js', 'server');
+
+ // we depend on LocalCollection._diffObjects, _applyChanges,
+ // _idParse, _idStringify.
+ api.use('minimongo', ['client', 'server']);
+
+ api.add_files('heartbeat.js', ['client', 'server']);
+
+ api.add_files('livedata_server.js', 'server');
+
+ api.add_files('writefence.js', 'server');
+ api.add_files('crossbar.js', 'server');
+
+ api.add_files('livedata_common.js', ['client', 'server']);
+ api.add_files('random_stream.js', ['client', 'server']);
+
+ api.add_files('livedata_connection.js', ['client', 'server']);
+
+
+ api.add_files('client_convenience.js', 'client');
+ api.add_files('server_convenience.js', 'server');
+});
+
+Package.on_test(function (api) {
+ api.use('livedata', ['client', 'server']);
+ api.use('mongo', ['client', 'server']);
+ api.use('test-helpers', ['client', 'server']);
+ api.use(['underscore', 'tinytest', 'random', 'tracker', 'minimongo', 'reactive-var']);
+
+ api.add_files('stub_stream.js');
+ api.add_files('livedata_server_tests.js', 'server');
+ api.add_files('livedata_connection_tests.js', ['client', 'server']);
+ api.add_files('livedata_tests.js', ['client', 'server']);
+ api.add_files('livedata_test_service.js', ['client', 'server']);
+ api.add_files('session_view_tests.js', ['server']);
+ api.add_files('crossbar_tests.js', ['server']);
+ api.add_files('random_stream_tests.js', ['client', 'server']);
+
+ api.use('http', 'client');
+ api.add_files(['stream_tests.js'], 'client');
+ api.add_files('stream_client_tests.js', 'server');
+ api.use('check', ['client', 'server']);
+});
diff --git a/packages/livedata/random_stream.js b/packages/ddp/random_stream.js
similarity index 100%
rename from packages/livedata/random_stream.js
rename to packages/ddp/random_stream.js
diff --git a/packages/livedata/random_stream_tests.js b/packages/ddp/random_stream_tests.js
similarity index 100%
rename from packages/livedata/random_stream_tests.js
rename to packages/ddp/random_stream_tests.js
diff --git a/packages/livedata/server_convenience.js b/packages/ddp/server_convenience.js
similarity index 100%
rename from packages/livedata/server_convenience.js
rename to packages/ddp/server_convenience.js
diff --git a/packages/livedata/session_view_tests.js b/packages/ddp/session_view_tests.js
similarity index 100%
rename from packages/livedata/session_view_tests.js
rename to packages/ddp/session_view_tests.js
diff --git a/packages/livedata/sockjs-0.3.4.js b/packages/ddp/sockjs-0.3.4.js
similarity index 100%
rename from packages/livedata/sockjs-0.3.4.js
rename to packages/ddp/sockjs-0.3.4.js
diff --git a/packages/livedata/stream_client_common.js b/packages/ddp/stream_client_common.js
similarity index 100%
rename from packages/livedata/stream_client_common.js
rename to packages/ddp/stream_client_common.js
diff --git a/packages/livedata/stream_client_nodejs.js b/packages/ddp/stream_client_nodejs.js
similarity index 100%
rename from packages/livedata/stream_client_nodejs.js
rename to packages/ddp/stream_client_nodejs.js
diff --git a/packages/livedata/stream_client_sockjs.js b/packages/ddp/stream_client_sockjs.js
similarity index 100%
rename from packages/livedata/stream_client_sockjs.js
rename to packages/ddp/stream_client_sockjs.js
diff --git a/packages/livedata/stream_client_tests.js b/packages/ddp/stream_client_tests.js
similarity index 100%
rename from packages/livedata/stream_client_tests.js
rename to packages/ddp/stream_client_tests.js
diff --git a/packages/livedata/stream_server.js b/packages/ddp/stream_server.js
similarity index 100%
rename from packages/livedata/stream_server.js
rename to packages/ddp/stream_server.js
diff --git a/packages/livedata/stream_tests.js b/packages/ddp/stream_tests.js
similarity index 100%
rename from packages/livedata/stream_tests.js
rename to packages/ddp/stream_tests.js
diff --git a/packages/livedata/stub_stream.js b/packages/ddp/stub_stream.js
similarity index 100%
rename from packages/livedata/stub_stream.js
rename to packages/ddp/stub_stream.js
diff --git a/packages/livedata/writefence.js b/packages/ddp/writefence.js
similarity index 100%
rename from packages/livedata/writefence.js
rename to packages/ddp/writefence.js
diff --git a/packages/deps/deps.js b/packages/deps/deps.js
deleted file mode 100644
index 95402685b0..0000000000
--- a/packages/deps/deps.js
+++ /dev/null
@@ -1 +0,0 @@
-Deps = Tracker;
diff --git a/packages/deps/package.js b/packages/deps/package.js
index e5db01f81b..b62928de3f 100644
--- a/packages/deps/package.js
+++ b/packages/deps/package.js
@@ -2,11 +2,10 @@
Package.describe({
summary: "Deprecated package, please use tracker instead.",
- version: '1.0.1'
+ version: '1.0.2-rc1'
});
Package.on_use(function (api) {
api.use('tracker');
- api.export('Deps');
- api.add_files('deps.js');
+ api.imply('tracker');
});
diff --git a/packages/device-orientation/.gitignore b/packages/device-orientation/.gitignore
new file mode 100644
index 0000000000..677a6fc263
--- /dev/null
+++ b/packages/device-orientation/.gitignore
@@ -0,0 +1 @@
+.build*
diff --git a/packages/device-orientation/device-orientation.js b/packages/device-orientation/device-orientation.js
new file mode 100644
index 0000000000..40279d2264
--- /dev/null
+++ b/packages/device-orientation/device-orientation.js
@@ -0,0 +1,26 @@
+var headingDep = new Deps.Dependency();
+var heading = null;
+var headingRefresh = false;
+
+var callback = function (newHeading) {
+ heading = newHeading;
+ headingDep.changed();
+};
+
+var throttled = _.throttle(callback, 100);
+
+var enableHeadingRefresh = function () {
+ if (! headingRefresh && navigator.compass) {
+ navigator.compass.watchHeading(throttled);
+ headingRefresh = true;
+ }
+};
+
+document.addEventListener("deviceready", enableHeadingRefresh);
+
+DeviceOrientation = {
+ heading: function () {
+ headingDep.depend();
+ return heading;
+ }
+};
\ No newline at end of file
diff --git a/packages/device-orientation/package.js b/packages/device-orientation/package.js
new file mode 100644
index 0000000000..cf07ebf941
--- /dev/null
+++ b/packages/device-orientation/package.js
@@ -0,0 +1,16 @@
+Package.describe({
+ summary: "Provides reactive device orientation on desktop and mobile.",
+ version: "1.0.0-cordova4"
+});
+
+Cordova.depends({
+ "org.apache.cordova.device-orientation": "0.3.8"
+});
+
+Package.on_use(function (api) {
+ api.use(["deps", "underscore"]);
+
+ api.add_files(["device-orientation.js"], "client");
+
+ api.export("DeviceOrientation", "client");
+});
\ No newline at end of file
diff --git a/packages/device-orientation/versions.json b/packages/device-orientation/versions.json
new file mode 100644
index 0000000000..f90d6d0090
--- /dev/null
+++ b/packages/device-orientation/versions.json
@@ -0,0 +1,19 @@
+{
+ "dependencies": [
+ [
+ "deps",
+ "1.0.0"
+ ],
+ [
+ "meteor",
+ "1.0.0"
+ ],
+ [
+ "underscore",
+ "1.0.0"
+ ]
+ ],
+ "pluginDependencies": [],
+ "toolVersion": "meteor-tool@1.0.0",
+ "format": "1.0"
+}
\ No newline at end of file
diff --git a/packages/ejson/package.js b/packages/ejson/package.js
index 3a87742a2f..fdf4ef8034 100644
--- a/packages/ejson/package.js
+++ b/packages/ejson/package.js
@@ -1,6 +1,6 @@
Package.describe({
summary: "Extended and Extensible JSON library",
- version: '1.0.0'
+ version: '1.0.1-rc0'
});
Package.on_use(function (api) {
diff --git a/packages/facebook/facebook_client.js b/packages/facebook/facebook_client.js
index f49e352e37..4f9ef1a747 100644
--- a/packages/facebook/facebook_client.js
+++ b/packages/facebook/facebook_client.js
@@ -28,13 +28,19 @@ Facebook.requestCredential = function (options, credentialRequestCompleteCallbac
if (options && options.requestPermissions)
scope = options.requestPermissions.join(',');
+ var loginStyle = OAuth._loginStyle('facebook', config, options);
+
var loginUrl =
'https://www.facebook.com/dialog/oauth?client_id=' + config.appId +
- '&redirect_uri=' + Meteor.absoluteUrl('_oauth/facebook?close') +
- '&display=' + display + '&scope=' + scope + '&state=' + credentialToken;
+ '&redirect_uri=' + OAuth._redirectUri('facebook', config) +
+ '&display=' + display + '&scope=' + scope +
+ '&state=' + OAuth._stateParam(loginStyle, credentialToken);
- OAuth.showPopup(
- loginUrl,
- _.bind(credentialRequestCompleteCallback, null, credentialToken)
- );
+ OAuth.launchLogin({
+ loginService: "facebook",
+ loginStyle: loginStyle,
+ loginUrl: loginUrl,
+ credentialRequestCompleteCallback: credentialRequestCompleteCallback,
+ credentialToken: credentialToken
+ });
};
diff --git a/packages/facebook/facebook_server.js b/packages/facebook/facebook_server.js
index aca7637e1d..4a998970c4 100644
--- a/packages/facebook/facebook_server.js
+++ b/packages/facebook/facebook_server.js
@@ -53,7 +53,7 @@ var getTokenResponse = function (query) {
"https://graph.facebook.com/oauth/access_token", {
params: {
client_id: config.appId,
- redirect_uri: Meteor.absoluteUrl("_oauth/facebook?close"),
+ redirect_uri: OAuth._redirectUri('facebook', config),
client_secret: OAuth.openSecret(config.secret),
code: query.code
}
diff --git a/packages/facebook/package.js b/packages/facebook/package.js
index 825363a031..8f002038e8 100644
--- a/packages/facebook/package.js
+++ b/packages/facebook/package.js
@@ -1,6 +1,6 @@
Package.describe({
summary: "Facebook OAuth flow",
- version: "1.0.0"
+ version: "1.0.1-rc0"
});
Package.on_use(function(api) {
diff --git a/packages/facts/package.js b/packages/facts/package.js
index 40e695895a..604ca0b401 100644
--- a/packages/facts/package.js
+++ b/packages/facts/package.js
@@ -1,18 +1,18 @@
Package.describe({
summary: "Publish internal app statistics",
- version: '1.0.0'
+ version: '1.0.1-rc0'
});
Package.on_use(function (api) {
api.use(['underscore'], ['client', 'server']);
- api.use(['templating', 'mongo-livedata', 'livedata'], ['client']);
+ api.use(['templating', 'mongo', 'ddp'], ['client']);
// Detect whether autopublish is used.
api.use('autopublish', 'server', {weak: true});
// Unordered dependency on livedata, since livedata has a (weak) dependency on
// us.
- api.use('livedata', 'server', {unordered: true});
+ api.use('ddp', 'server', {unordered: true});
api.add_files('facts.html', ['client']);
api.add_files('facts.js', ['client', 'server']);
diff --git a/packages/fastclick/.gitignore b/packages/fastclick/.gitignore
new file mode 100644
index 0000000000..677a6fc263
--- /dev/null
+++ b/packages/fastclick/.gitignore
@@ -0,0 +1 @@
+.build*
diff --git a/packages/fastclick/fastclick.js b/packages/fastclick/fastclick.js
new file mode 100644
index 0000000000..d3312ce767
--- /dev/null
+++ b/packages/fastclick/fastclick.js
@@ -0,0 +1,821 @@
+/**
+ * @preserve FastClick: polyfill to remove click delays on browsers with touch UIs.
+ *
+ * @version 1.0.3
+ * @codingstandard ftlabs-jsv2
+ * @copyright The Financial Times Limited [All Rights Reserved]
+ * @license MIT License (see LICENSE.txt)
+ */
+
+/*jslint browser:true, node:true*/
+/*global define, Event, Node*/
+
+
+/**
+ * Instantiate fast-clicking listeners on the specified layer.
+ *
+ * @constructor
+ * @param {Element} layer The layer to listen on
+ * @param {Object} options The options to override the defaults
+ */
+function FastClick(layer, options) {
+ 'use strict';
+ var oldOnClick;
+
+ options = options || {};
+
+ /**
+ * Whether a click is currently being tracked.
+ *
+ * @type boolean
+ */
+ this.trackingClick = false;
+
+
+ /**
+ * Timestamp for when click tracking started.
+ *
+ * @type number
+ */
+ this.trackingClickStart = 0;
+
+
+ /**
+ * The element being tracked for a click.
+ *
+ * @type EventTarget
+ */
+ this.targetElement = null;
+
+
+ /**
+ * X-coordinate of touch start event.
+ *
+ * @type number
+ */
+ this.touchStartX = 0;
+
+
+ /**
+ * Y-coordinate of touch start event.
+ *
+ * @type number
+ */
+ this.touchStartY = 0;
+
+
+ /**
+ * ID of the last touch, retrieved from Touch.identifier.
+ *
+ * @type number
+ */
+ this.lastTouchIdentifier = 0;
+
+
+ /**
+ * Touchmove boundary, beyond which a click will be cancelled.
+ *
+ * @type number
+ */
+ this.touchBoundary = options.touchBoundary || 10;
+
+
+ /**
+ * The FastClick layer.
+ *
+ * @type Element
+ */
+ this.layer = layer;
+
+ /**
+ * The minimum time between tap(touchstart and touchend) events
+ *
+ * @type number
+ */
+ this.tapDelay = options.tapDelay || 200;
+
+ if (FastClick.notNeeded(layer)) {
+ return;
+ }
+
+ // Some old versions of Android don't have Function.prototype.bind
+ function bind(method, context) {
+ return function() { return method.apply(context, arguments); };
+ }
+
+
+ var methods = ['onMouse', 'onClick', 'onTouchStart', 'onTouchMove', 'onTouchEnd', 'onTouchCancel'];
+ var context = this;
+ for (var i = 0, l = methods.length; i < l; i++) {
+ context[methods[i]] = bind(context[methods[i]], context);
+ }
+
+ // Set up event handlers as required
+ if (deviceIsAndroid) {
+ layer.addEventListener('mouseover', this.onMouse, true);
+ layer.addEventListener('mousedown', this.onMouse, true);
+ layer.addEventListener('mouseup', this.onMouse, true);
+ }
+
+ layer.addEventListener('click', this.onClick, true);
+ layer.addEventListener('touchstart', this.onTouchStart, false);
+ layer.addEventListener('touchmove', this.onTouchMove, false);
+ layer.addEventListener('touchend', this.onTouchEnd, false);
+ layer.addEventListener('touchcancel', this.onTouchCancel, false);
+
+ // Hack is required for browsers that don't support Event#stopImmediatePropagation (e.g. Android 2)
+ // which is how FastClick normally stops click events bubbling to callbacks registered on the FastClick
+ // layer when they are cancelled.
+ if (!Event.prototype.stopImmediatePropagation) {
+ layer.removeEventListener = function(type, callback, capture) {
+ var rmv = Node.prototype.removeEventListener;
+ if (type === 'click') {
+ rmv.call(layer, type, callback.hijacked || callback, capture);
+ } else {
+ rmv.call(layer, type, callback, capture);
+ }
+ };
+
+ layer.addEventListener = function(type, callback, capture) {
+ var adv = Node.prototype.addEventListener;
+ if (type === 'click') {
+ adv.call(layer, type, callback.hijacked || (callback.hijacked = function(event) {
+ if (!event.propagationStopped) {
+ callback(event);
+ }
+ }), capture);
+ } else {
+ adv.call(layer, type, callback, capture);
+ }
+ };
+ }
+
+ // If a handler is already declared in the element's onclick attribute, it will be fired before
+ // FastClick's onClick handler. Fix this by pulling out the user-defined handler function and
+ // adding it as listener.
+ if (typeof layer.onclick === 'function') {
+
+ // Android browser on at least 3.2 requires a new reference to the function in layer.onclick
+ // - the old one won't work if passed to addEventListener directly.
+ oldOnClick = layer.onclick;
+ layer.addEventListener('click', function(event) {
+ oldOnClick(event);
+ }, false);
+ layer.onclick = null;
+ }
+}
+
+
+/**
+ * Android requires exceptions.
+ *
+ * @type boolean
+ */
+var deviceIsAndroid = navigator.userAgent.indexOf('Android') > 0;
+
+
+/**
+ * iOS requires exceptions.
+ *
+ * @type boolean
+ */
+var deviceIsIOS = /iP(ad|hone|od)/.test(navigator.userAgent);
+
+
+/**
+ * iOS 4 requires an exception for select elements.
+ *
+ * @type boolean
+ */
+var deviceIsIOS4 = deviceIsIOS && (/OS 4_\d(_\d)?/).test(navigator.userAgent);
+
+
+/**
+ * iOS 6.0(+?) requires the target element to be manually derived
+ *
+ * @type boolean
+ */
+var deviceIsIOSWithBadTarget = deviceIsIOS && (/OS ([6-9]|\d{2})_\d/).test(navigator.userAgent);
+
+/**
+ * BlackBerry requires exceptions.
+ *
+ * @type boolean
+ */
+var deviceIsBlackBerry10 = navigator.userAgent.indexOf('BB10') > 0;
+
+/**
+ * Determine whether a given element requires a native click.
+ *
+ * @param {EventTarget|Element} target Target DOM element
+ * @returns {boolean} Returns true if the element needs a native click
+ */
+FastClick.prototype.needsClick = function(target) {
+ 'use strict';
+ switch (target.nodeName.toLowerCase()) {
+
+ // Don't send a synthetic click to disabled inputs (issue #62)
+ case 'button':
+ case 'select':
+ case 'textarea':
+ if (target.disabled) {
+ return true;
+ }
+
+ break;
+ case 'input':
+
+ // File inputs need real clicks on iOS 6 due to a browser bug (issue #68)
+ if ((deviceIsIOS && target.type === 'file') || target.disabled) {
+ return true;
+ }
+
+ break;
+ case 'label':
+ case 'video':
+ return true;
+ }
+
+ return (/\bneedsclick\b/).test(target.className);
+};
+
+
+/**
+ * Determine whether a given element requires a call to focus to simulate click into element.
+ *
+ * @param {EventTarget|Element} target Target DOM element
+ * @returns {boolean} Returns true if the element requires a call to focus to simulate native click.
+ */
+FastClick.prototype.needsFocus = function(target) {
+ 'use strict';
+ switch (target.nodeName.toLowerCase()) {
+ case 'textarea':
+ return true;
+ case 'select':
+ return !deviceIsAndroid;
+ case 'input':
+ switch (target.type) {
+ case 'button':
+ case 'checkbox':
+ case 'file':
+ case 'image':
+ case 'radio':
+ case 'submit':
+ return false;
+ }
+
+ // No point in attempting to focus disabled inputs
+ return !target.disabled && !target.readOnly;
+ default:
+ return (/\bneedsfocus\b/).test(target.className);
+ }
+};
+
+
+/**
+ * Send a click event to the specified element.
+ *
+ * @param {EventTarget|Element} targetElement
+ * @param {Event} event
+ */
+FastClick.prototype.sendClick = function(targetElement, event) {
+ 'use strict';
+ var clickEvent, touch;
+
+ // On some Android devices activeElement needs to be blurred otherwise the synthetic click will have no effect (#24)
+ if (document.activeElement && document.activeElement !== targetElement) {
+ document.activeElement.blur();
+ }
+
+ touch = event.changedTouches[0];
+
+ // Synthesise a click event, with an extra attribute so it can be tracked
+ clickEvent = document.createEvent('MouseEvents');
+ clickEvent.initMouseEvent(this.determineEventType(targetElement), true, true, window, 1, touch.screenX, touch.screenY, touch.clientX, touch.clientY, false, false, false, false, 0, null);
+ clickEvent.forwardedTouchEvent = true;
+ targetElement.dispatchEvent(clickEvent);
+};
+
+FastClick.prototype.determineEventType = function(targetElement) {
+ 'use strict';
+
+ //Issue #159: Android Chrome Select Box does not open with a synthetic click event
+ if (deviceIsAndroid && targetElement.tagName.toLowerCase() === 'select') {
+ return 'mousedown';
+ }
+
+ return 'click';
+};
+
+
+/**
+ * @param {EventTarget|Element} targetElement
+ */
+FastClick.prototype.focus = function(targetElement) {
+ 'use strict';
+ var length;
+
+ // Issue #160: on iOS 7, some input elements (e.g. date datetime) throw a vague TypeError on setSelectionRange. These elements don't have an integer value for the selectionStart and selectionEnd properties, but unfortunately that can't be used for detection because accessing the properties also throws a TypeError. Just check the type instead. Filed as Apple bug #15122724.
+ if (deviceIsIOS && targetElement.setSelectionRange && targetElement.type.indexOf('date') !== 0 && targetElement.type !== 'time') {
+ length = targetElement.value.length;
+ targetElement.setSelectionRange(length, length);
+ } else {
+ targetElement.focus();
+ }
+};
+
+
+/**
+ * Check whether the given target element is a child of a scrollable layer and if so, set a flag on it.
+ *
+ * @param {EventTarget|Element} targetElement
+ */
+FastClick.prototype.updateScrollParent = function(targetElement) {
+ 'use strict';
+ var scrollParent, parentElement;
+
+ scrollParent = targetElement.fastClickScrollParent;
+
+ // Attempt to discover whether the target element is contained within a scrollable layer. Re-check if the
+ // target element was moved to another parent.
+ if (!scrollParent || !scrollParent.contains(targetElement)) {
+ parentElement = targetElement;
+ do {
+ if (parentElement.scrollHeight > parentElement.offsetHeight) {
+ scrollParent = parentElement;
+ targetElement.fastClickScrollParent = parentElement;
+ break;
+ }
+
+ parentElement = parentElement.parentElement;
+ } while (parentElement);
+ }
+
+ // Always update the scroll top tracker if possible.
+ if (scrollParent) {
+ scrollParent.fastClickLastScrollTop = scrollParent.scrollTop;
+ }
+};
+
+
+/**
+ * @param {EventTarget} targetElement
+ * @returns {Element|EventTarget}
+ */
+FastClick.prototype.getTargetElementFromEventTarget = function(eventTarget) {
+ 'use strict';
+
+ // On some older browsers (notably Safari on iOS 4.1 - see issue #56) the event target may be a text node.
+ if (eventTarget.nodeType === Node.TEXT_NODE) {
+ return eventTarget.parentNode;
+ }
+
+ return eventTarget;
+};
+
+
+/**
+ * On touch start, record the position and scroll offset.
+ *
+ * @param {Event} event
+ * @returns {boolean}
+ */
+FastClick.prototype.onTouchStart = function(event) {
+ 'use strict';
+ var targetElement, touch, selection;
+
+ // Ignore multiple touches, otherwise pinch-to-zoom is prevented if both fingers are on the FastClick element (issue #111).
+ if (event.targetTouches.length > 1) {
+ return true;
+ }
+
+ targetElement = this.getTargetElementFromEventTarget(event.target);
+ touch = event.targetTouches[0];
+
+ if (deviceIsIOS) {
+
+ // Only trusted events will deselect text on iOS (issue #49)
+ selection = window.getSelection();
+ if (selection.rangeCount && !selection.isCollapsed) {
+ return true;
+ }
+
+ if (!deviceIsIOS4) {
+
+ // Weird things happen on iOS when an alert or confirm dialog is opened from a click event callback (issue #23):
+ // when the user next taps anywhere else on the page, new touchstart and touchend events are dispatched
+ // with the same identifier as the touch event that previously triggered the click that triggered the alert.
+ // Sadly, there is an issue on iOS 4 that causes some normal touch events to have the same identifier as an
+ // immediately preceeding touch event (issue #52), so this fix is unavailable on that platform.
+ // Issue 120: touch.identifier is 0 when Chrome dev tools 'Emulate touch events' is set with an iOS device UA string,
+ // which causes all touch events to be ignored. As this block only applies to iOS, and iOS identifiers are always long,
+ // random integers, it's safe to to continue if the identifier is 0 here.
+ if (touch.identifier && touch.identifier === this.lastTouchIdentifier) {
+ event.preventDefault();
+ return false;
+ }
+
+ this.lastTouchIdentifier = touch.identifier;
+
+ // If the target element is a child of a scrollable layer (using -webkit-overflow-scrolling: touch) and:
+ // 1) the user does a fling scroll on the scrollable layer
+ // 2) the user stops the fling scroll with another tap
+ // then the event.target of the last 'touchend' event will be the element that was under the user's finger
+ // when the fling scroll was started, causing FastClick to send a click event to that layer - unless a check
+ // is made to ensure that a parent layer was not scrolled before sending a synthetic click (issue #42).
+ this.updateScrollParent(targetElement);
+ }
+ }
+
+ this.trackingClick = true;
+ this.trackingClickStart = event.timeStamp;
+ this.targetElement = targetElement;
+
+ this.touchStartX = touch.pageX;
+ this.touchStartY = touch.pageY;
+
+ // Prevent phantom clicks on fast double-tap (issue #36)
+ if ((event.timeStamp - this.lastClickTime) < this.tapDelay) {
+ event.preventDefault();
+ }
+
+ return true;
+};
+
+
+/**
+ * Based on a touchmove event object, check whether the touch has moved past a boundary since it started.
+ *
+ * @param {Event} event
+ * @returns {boolean}
+ */
+FastClick.prototype.touchHasMoved = function(event) {
+ 'use strict';
+ var touch = event.changedTouches[0], boundary = this.touchBoundary;
+
+ if (Math.abs(touch.pageX - this.touchStartX) > boundary || Math.abs(touch.pageY - this.touchStartY) > boundary) {
+ return true;
+ }
+
+ return false;
+};
+
+
+/**
+ * Update the last position.
+ *
+ * @param {Event} event
+ * @returns {boolean}
+ */
+FastClick.prototype.onTouchMove = function(event) {
+ 'use strict';
+ if (!this.trackingClick) {
+ return true;
+ }
+
+ // If the touch has moved, cancel the click tracking
+ if (this.targetElement !== this.getTargetElementFromEventTarget(event.target) || this.touchHasMoved(event)) {
+ this.trackingClick = false;
+ this.targetElement = null;
+ }
+
+ return true;
+};
+
+
+/**
+ * Attempt to find the labelled control for the given label element.
+ *
+ * @param {EventTarget|HTMLLabelElement} labelElement
+ * @returns {Element|null}
+ */
+FastClick.prototype.findControl = function(labelElement) {
+ 'use strict';
+
+ // Fast path for newer browsers supporting the HTML5 control attribute
+ if (labelElement.control !== undefined) {
+ return labelElement.control;
+ }
+
+ // All browsers under test that support touch events also support the HTML5 htmlFor attribute
+ if (labelElement.htmlFor) {
+ return document.getElementById(labelElement.htmlFor);
+ }
+
+ // If no for attribute exists, attempt to retrieve the first labellable descendant element
+ // the list of which is defined here: http://www.w3.org/TR/html5/forms.html#category-label
+ return labelElement.querySelector('button, input:not([type=hidden]), keygen, meter, output, progress, select, textarea');
+};
+
+
+/**
+ * On touch end, determine whether to send a click event at once.
+ *
+ * @param {Event} event
+ * @returns {boolean}
+ */
+FastClick.prototype.onTouchEnd = function(event) {
+ 'use strict';
+ var forElement, trackingClickStart, targetTagName, scrollParent, touch, targetElement = this.targetElement;
+
+ if (!this.trackingClick) {
+ return true;
+ }
+
+ // Prevent phantom clicks on fast double-tap (issue #36)
+ if ((event.timeStamp - this.lastClickTime) < this.tapDelay) {
+ this.cancelNextClick = true;
+ return true;
+ }
+
+ // Reset to prevent wrong click cancel on input (issue #156).
+ this.cancelNextClick = false;
+
+ this.lastClickTime = event.timeStamp;
+
+ trackingClickStart = this.trackingClickStart;
+ this.trackingClick = false;
+ this.trackingClickStart = 0;
+
+ // On some iOS devices, the targetElement supplied with the event is invalid if the layer
+ // is performing a transition or scroll, and has to be re-detected manually. Note that
+ // for this to function correctly, it must be called *after* the event target is checked!
+ // See issue #57; also filed as rdar://13048589 .
+ if (deviceIsIOSWithBadTarget) {
+ touch = event.changedTouches[0];
+
+ // In certain cases arguments of elementFromPoint can be negative, so prevent setting targetElement to null
+ targetElement = document.elementFromPoint(touch.pageX - window.pageXOffset, touch.pageY - window.pageYOffset) || targetElement;
+ targetElement.fastClickScrollParent = this.targetElement.fastClickScrollParent;
+ }
+
+ targetTagName = targetElement.tagName.toLowerCase();
+ if (targetTagName === 'label') {
+ forElement = this.findControl(targetElement);
+ if (forElement) {
+ this.focus(targetElement);
+ if (deviceIsAndroid) {
+ return false;
+ }
+
+ targetElement = forElement;
+ }
+ } else if (this.needsFocus(targetElement)) {
+
+ // Case 1: If the touch started a while ago (best guess is 100ms based on tests for issue #36) then focus will be triggered anyway. Return early and unset the target element reference so that the subsequent click will be allowed through.
+ // Case 2: Without this exception for input elements tapped when the document is contained in an iframe, then any inputted text won't be visible even though the value attribute is updated as the user types (issue #37).
+ if ((event.timeStamp - trackingClickStart) > 100 || (deviceIsIOS && window.top !== window && targetTagName === 'input')) {
+ this.targetElement = null;
+ return false;
+ }
+
+ this.focus(targetElement);
+ this.sendClick(targetElement, event);
+
+ // Select elements need the event to go through on iOS 4, otherwise the selector menu won't open.
+ // Also this breaks opening selects when VoiceOver is active on iOS6, iOS7 (and possibly others)
+ if (!deviceIsIOS || targetTagName !== 'select') {
+ this.targetElement = null;
+ event.preventDefault();
+ }
+
+ return false;
+ }
+
+ if (deviceIsIOS && !deviceIsIOS4) {
+
+ // Don't send a synthetic click event if the target element is contained within a parent layer that was scrolled
+ // and this tap is being used to stop the scrolling (usually initiated by a fling - issue #42).
+ scrollParent = targetElement.fastClickScrollParent;
+ if (scrollParent && scrollParent.fastClickLastScrollTop !== scrollParent.scrollTop) {
+ return true;
+ }
+ }
+
+ // Prevent the actual click from going though - unless the target node is marked as requiring
+ // real clicks or if it is in the whitelist in which case only non-programmatic clicks are permitted.
+ if (!this.needsClick(targetElement)) {
+ event.preventDefault();
+ this.sendClick(targetElement, event);
+ }
+
+ return false;
+};
+
+
+/**
+ * On touch cancel, stop tracking the click.
+ *
+ * @returns {void}
+ */
+FastClick.prototype.onTouchCancel = function() {
+ 'use strict';
+ this.trackingClick = false;
+ this.targetElement = null;
+};
+
+
+/**
+ * Determine mouse events which should be permitted.
+ *
+ * @param {Event} event
+ * @returns {boolean}
+ */
+FastClick.prototype.onMouse = function(event) {
+ 'use strict';
+
+ // If a target element was never set (because a touch event was never fired) allow the event
+ if (!this.targetElement) {
+ return true;
+ }
+
+ if (event.forwardedTouchEvent) {
+ return true;
+ }
+
+ // Programmatically generated events targeting a specific element should be permitted
+ if (!event.cancelable) {
+ return true;
+ }
+
+ // Derive and check the target element to see whether the mouse event needs to be permitted;
+ // unless explicitly enabled, prevent non-touch click events from triggering actions,
+ // to prevent ghost/doubleclicks.
+ if (!this.needsClick(this.targetElement) || this.cancelNextClick) {
+
+ // Prevent any user-added listeners declared on FastClick element from being fired.
+ if (event.stopImmediatePropagation) {
+ event.stopImmediatePropagation();
+ } else {
+
+ // Part of the hack for browsers that don't support Event#stopImmediatePropagation (e.g. Android 2)
+ event.propagationStopped = true;
+ }
+
+ // Cancel the event
+ event.stopPropagation();
+ event.preventDefault();
+
+ return false;
+ }
+
+ // If the mouse event is permitted, return true for the action to go through.
+ return true;
+};
+
+
+/**
+ * On actual clicks, determine whether this is a touch-generated click, a click action occurring
+ * naturally after a delay after a touch (which needs to be cancelled to avoid duplication), or
+ * an actual click which should be permitted.
+ *
+ * @param {Event} event
+ * @returns {boolean}
+ */
+FastClick.prototype.onClick = function(event) {
+ 'use strict';
+ var permitted;
+
+ // It's possible for another FastClick-like library delivered with third-party code to fire a click event before FastClick does (issue #44). In that case, set the click-tracking flag back to false and return early. This will cause onTouchEnd to return early.
+ if (this.trackingClick) {
+ this.targetElement = null;
+ this.trackingClick = false;
+ return true;
+ }
+
+ // Very odd behaviour on iOS (issue #18): if a submit element is present inside a form and the user hits enter in the iOS simulator or clicks the Go button on the pop-up OS keyboard the a kind of 'fake' click event will be triggered with the submit-type input element as the target.
+ if (event.target.type === 'submit' && event.detail === 0) {
+ return true;
+ }
+
+ permitted = this.onMouse(event);
+
+ // Only unset targetElement if the click is not permitted. This will ensure that the check for !targetElement in onMouse fails and the browser's click doesn't go through.
+ if (!permitted) {
+ this.targetElement = null;
+ }
+
+ // If clicks are permitted, return true for the action to go through.
+ return permitted;
+};
+
+
+/**
+ * Remove all FastClick's event listeners.
+ *
+ * @returns {void}
+ */
+FastClick.prototype.destroy = function() {
+ 'use strict';
+ var layer = this.layer;
+
+ if (deviceIsAndroid) {
+ layer.removeEventListener('mouseover', this.onMouse, true);
+ layer.removeEventListener('mousedown', this.onMouse, true);
+ layer.removeEventListener('mouseup', this.onMouse, true);
+ }
+
+ layer.removeEventListener('click', this.onClick, true);
+ layer.removeEventListener('touchstart', this.onTouchStart, false);
+ layer.removeEventListener('touchmove', this.onTouchMove, false);
+ layer.removeEventListener('touchend', this.onTouchEnd, false);
+ layer.removeEventListener('touchcancel', this.onTouchCancel, false);
+};
+
+
+/**
+ * Check whether FastClick is needed.
+ *
+ * @param {Element} layer The layer to listen on
+ */
+FastClick.notNeeded = function(layer) {
+ 'use strict';
+ var metaViewport;
+ var chromeVersion;
+ var blackberryVersion;
+
+ // Devices that don't support touch don't need FastClick
+ if (typeof window.ontouchstart === 'undefined') {
+ return true;
+ }
+
+ // Chrome version - zero for other browsers
+ chromeVersion = +(/Chrome\/([0-9]+)/.exec(navigator.userAgent) || [,0])[1];
+
+ if (chromeVersion) {
+
+ if (deviceIsAndroid) {
+ metaViewport = document.querySelector('meta[name=viewport]');
+
+ if (metaViewport) {
+ // Chrome on Android with user-scalable="no" doesn't need FastClick (issue #89)
+ if (metaViewport.content.indexOf('user-scalable=no') !== -1) {
+ return true;
+ }
+ // Chrome 32 and above with width=device-width or less don't need FastClick
+ if (chromeVersion > 31 && document.documentElement.scrollWidth <= window.outerWidth) {
+ return true;
+ }
+ }
+
+ // Chrome desktop doesn't need FastClick (issue #15)
+ } else {
+ return true;
+ }
+ }
+
+ if (deviceIsBlackBerry10) {
+ blackberryVersion = navigator.userAgent.match(/Version\/([0-9]*)\.([0-9]*)/);
+
+ // BlackBerry 10.3+ does not require Fastclick library.
+ // https://github.com/ftlabs/fastclick/issues/251
+ if (blackberryVersion[1] >= 10 && blackberryVersion[2] >= 3) {
+ metaViewport = document.querySelector('meta[name=viewport]');
+
+ if (metaViewport) {
+ // user-scalable=no eliminates click delay.
+ if (metaViewport.content.indexOf('user-scalable=no') !== -1) {
+ return true;
+ }
+ // width=device-width (or less than device-width) eliminates click delay.
+ if (document.documentElement.scrollWidth <= window.outerWidth) {
+ return true;
+ }
+ }
+ }
+ }
+
+ // IE10 with -ms-touch-action: none, which disables double-tap-to-zoom (issue #97)
+ if (layer.style.msTouchAction === 'none') {
+ return true;
+ }
+
+ return false;
+};
+
+
+/**
+ * Factory method for creating a FastClick object
+ *
+ * @param {Element} layer The layer to listen on
+ * @param {Object} options The options to override the defaults
+ */
+FastClick.attach = function(layer, options) {
+ 'use strict';
+ return new FastClick(layer, options);
+};
+
+
+if (typeof define == 'function' && typeof define.amd == 'object' && define.amd) {
+
+ // AMD. Register as an anonymous module.
+ define(function() {
+ 'use strict';
+ return FastClick;
+ });
+} else if (typeof module !== 'undefined' && module.exports) {
+ module.exports = FastClick.attach;
+ module.exports.FastClick = FastClick;
+} else {
+ window.FastClick = FastClick;
+}
\ No newline at end of file
diff --git a/packages/fastclick/package.js b/packages/fastclick/package.js
new file mode 100644
index 0000000000..ad0941c1e3
--- /dev/null
+++ b/packages/fastclick/package.js
@@ -0,0 +1,10 @@
+Package.describe({
+ summary: "Faster touch events on mobile",
+ version: '1.0.0-cordova1'
+});
+
+Package.on_use(function (api) {
+ api.export('FastClick', 'web.cordova');
+
+ api.addFiles(['pre.js', 'fastclick.js', 'post.js'], 'web.cordova');
+});
diff --git a/packages/fastclick/post.js b/packages/fastclick/post.js
new file mode 100644
index 0000000000..2acbae55dd
--- /dev/null
+++ b/packages/fastclick/post.js
@@ -0,0 +1,8 @@
+// This exports object was created in pre.js. Now copy the 'FastClick' object
+// from it into the package-scope variable `FastClick`, which will get exported.
+
+FastClick = module.exports.FastClick;
+
+Meteor.startup(function () {
+ FastClick.attach(document.body);
+});
diff --git a/packages/fastclick/pre.js b/packages/fastclick/pre.js
new file mode 100644
index 0000000000..f4f39dcffe
--- /dev/null
+++ b/packages/fastclick/pre.js
@@ -0,0 +1,6 @@
+// Define an object named module.exports. This will cause fastclick.js to put
+// FastClick as a field on it, instead of in the global namespace.
+// See also post.js.
+module = {
+ exports: {}
+};
diff --git a/packages/follower-livedata/package.js b/packages/follower-livedata/package.js
index e6e3eb87be..b73cb1e961 100644
--- a/packages/follower-livedata/package.js
+++ b/packages/follower-livedata/package.js
@@ -4,7 +4,7 @@ Package.describe({
});
Package.on_use(function (api) {
- api.use(['logging', 'underscore', 'livedata', 'ejson']);
+ api.use(['logging', 'underscore', 'ddp', 'ejson']);
api.add_files(['follower.js'], 'server');
api.export('Follower');
});
diff --git a/packages/force-ssl/package.js b/packages/force-ssl/package.js
index 1b869071b0..4e89bd1706 100644
--- a/packages/force-ssl/package.js
+++ b/packages/force-ssl/package.js
@@ -8,7 +8,7 @@ Package.on_use(function (api) {
api.use('underscore');
// make sure we come after livedata, so we load after the sockjs
// server has been instantiated.
- api.use('livedata', 'server');
+ api.use('ddp', 'server');
api.add_files('force_ssl_common.js', ['client', 'server']);
api.add_files('force_ssl_server.js', 'server');
diff --git a/packages/geolocation/.gitignore b/packages/geolocation/.gitignore
new file mode 100644
index 0000000000..677a6fc263
--- /dev/null
+++ b/packages/geolocation/.gitignore
@@ -0,0 +1 @@
+.build*
diff --git a/packages/geolocation/geolocation.js b/packages/geolocation/geolocation.js
new file mode 100644
index 0000000000..245f13eb16
--- /dev/null
+++ b/packages/geolocation/geolocation.js
@@ -0,0 +1,45 @@
+var locationDep = new Deps.Dependency();
+var location = null;
+var locationRefresh = false;
+
+var options = {
+ enableHighAccuracy: true,
+ maximumAge: 0
+};
+
+var errCallback = function () {
+ // do nothing
+};
+
+var callback = function (newLocation) {
+ location = newLocation;
+ locationDep.changed();
+};
+
+var enableLocationRefresh = function () {
+ if (! locationRefresh && navigator.geolocation) {
+ navigator.geolocation.watchPosition(callback, errCallback, options);
+ locationRefresh = true;
+ }
+};
+
+Geolocation = {
+ currentLocation: function () {
+ enableLocationRefresh();
+ locationDep.depend();
+ return location;
+ },
+ // simple version of location; just lat and lng
+ latLng: function () {
+ var loc = Geolocation.currentLocation();
+
+ if (loc) {
+ return {
+ lat: loc.coords.latitude,
+ lng: loc.coords.longitude
+ };
+ }
+
+ return null;
+ }
+};
\ No newline at end of file
diff --git a/packages/geolocation/package.js b/packages/geolocation/package.js
new file mode 100644
index 0000000000..48dfe6afff
--- /dev/null
+++ b/packages/geolocation/package.js
@@ -0,0 +1,16 @@
+Package.describe({
+ summary: "Provides reactive geolocation on desktop and mobile.",
+ version: "1.0.0-cordova2"
+});
+
+Cordova.depends({
+ "org.apache.cordova.geolocation": "0.3.9"
+});
+
+Package.on_use(function (api) {
+ api.use(["deps"]);
+
+ api.add_files(["geolocation.js"], "client");
+
+ api.export("Geolocation", "client");
+});
\ No newline at end of file
diff --git a/packages/geolocation/versions.json b/packages/geolocation/versions.json
new file mode 100644
index 0000000000..f90d6d0090
--- /dev/null
+++ b/packages/geolocation/versions.json
@@ -0,0 +1,19 @@
+{
+ "dependencies": [
+ [
+ "deps",
+ "1.0.0"
+ ],
+ [
+ "meteor",
+ "1.0.0"
+ ],
+ [
+ "underscore",
+ "1.0.0"
+ ]
+ ],
+ "pluginDependencies": [],
+ "toolVersion": "meteor-tool@1.0.0",
+ "format": "1.0"
+}
\ No newline at end of file
diff --git a/packages/github/github_client.js b/packages/github/github_client.js
index 11b43eab87..7f00d95d0e 100644
--- a/packages/github/github_client.js
+++ b/packages/github/github_client.js
@@ -23,16 +23,21 @@ Github.requestCredential = function (options, credentialRequestCompleteCallback)
var scope = (options && options.requestPermissions) || [];
var flatScope = _.map(scope, encodeURIComponent).join('+');
- var loginUrl =
- 'https://github.com/login/oauth/authorize' +
- '?client_id=' + config.clientId +
- '&scope=' + flatScope +
- '&redirect_uri=' + Meteor.absoluteUrl('_oauth/github?close') +
- '&state=' + credentialToken;
+ var loginStyle = OAuth._loginStyle('github', config, options);
- OAuth.showPopup(
- loginUrl,
- _.bind(credentialRequestCompleteCallback, null, credentialToken),
- {width: 900, height: 450}
- );
+ var loginUrl =
+ 'https://github.com/login/oauth/authorize' +
+ '?client_id=' + config.clientId +
+ '&scope=' + flatScope +
+ '&redirect_uri=' + OAuth._redirectUri('github', config) +
+ '&state=' + OAuth._stateParam(loginStyle, credentialToken);
+
+ OAuth.launchLogin({
+ loginService: "github",
+ loginStyle: loginStyle,
+ loginUrl: loginUrl,
+ credentialRequestCompleteCallback: credentialRequestCompleteCallback,
+ credentialToken: credentialToken,
+ popupOptons: {width: 900, height: 450}
+ });
};
diff --git a/packages/github/github_configure.html b/packages/github/github_configure.html
index e89a855896..26d6d0cb3e 100644
--- a/packages/github/github_configure.html
+++ b/packages/github/github_configure.html
@@ -10,7 +10,7 @@
Set Homepage URL to: {{siteUrl}}
- Set Authorization callback URL to: {{siteUrl}}_oauth/github?close
+ Set Authorization callback URL to: {{siteUrl}}_oauth/github
diff --git a/packages/github/github_server.js b/packages/github/github_server.js
index 654ed86d11..4a9ff1f03a 100644
--- a/packages/github/github_server.js
+++ b/packages/github/github_server.js
@@ -38,7 +38,7 @@ var getAccessToken = function (query) {
code: query.code,
client_id: config.clientId,
client_secret: OAuth.openSecret(config.secret),
- redirect_uri: Meteor.absoluteUrl("_oauth/github?close"),
+ redirect_uri: OAuth._redirectUri('github', config),
state: query.state
}
});
diff --git a/packages/github/package.js b/packages/github/package.js
index 4a0626774d..a6f5c5dd43 100644
--- a/packages/github/package.js
+++ b/packages/github/package.js
@@ -1,6 +1,6 @@
Package.describe({
summary: "Github OAuth flow",
- version: "1.0.0"
+ version: "1.0.1-rc0"
});
Package.on_use(function(api) {
diff --git a/packages/google/google_client.js b/packages/google/google_client.js
index 864fa4a90a..0ac25f1711 100644
--- a/packages/google/google_client.js
+++ b/packages/google/google_client.js
@@ -35,13 +35,15 @@ Google.requestCredential = function (options, credentialRequestCompleteCallback)
var accessType = options.requestOfflineToken ? 'offline' : 'online';
var approvalPrompt = options.forceApprovalPrompt ? 'force' : 'auto';
+ var loginStyle = OAuth._loginStyle('google', config, options);
+
var loginUrl =
'https://accounts.google.com/o/oauth2/auth' +
'?response_type=code' +
'&client_id=' + config.clientId +
'&scope=' + flatScope +
- '&redirect_uri=' + Meteor.absoluteUrl('_oauth/google?close') +
- '&state=' + credentialToken +
+ '&redirect_uri=' + OAuth._redirectUri('google', config) +
+ '&state=' + OAuth._stateParam(loginStyle, credentialToken) +
'&access_type=' + accessType +
'&approval_prompt=' + approvalPrompt;
@@ -54,9 +56,12 @@ Google.requestCredential = function (options, credentialRequestCompleteCallback)
loginUrl += '&hd=' + encodeURIComponent(Accounts._options.restrictCreationByEmailDomain);
}
- OAuth.showPopup(
- loginUrl,
- _.bind(credentialRequestCompleteCallback, null, credentialToken),
- { height: 406 }
- );
+ OAuth.launchLogin({
+ loginService: "google",
+ loginStyle: loginStyle,
+ loginUrl: loginUrl,
+ credentialRequestCompleteCallback: credentialRequestCompleteCallback,
+ credentialToken: credentialToken,
+ popupOptions: { height: 406 }
+ });
};
diff --git a/packages/google/google_configure.html b/packages/google/google_configure.html
index 83917941b2..e49ad10f60 100644
--- a/packages/google/google_configure.html
+++ b/packages/google/google_configure.html
@@ -22,7 +22,7 @@
Set Authorized Javascript Origins to: {{siteUrl}}
- Set Authorized Redirect URI to: {{siteUrl}}_oauth/google?close
+ Set Authorized Redirect URI to: {{siteUrl}}_oauth/google
Click "Create Client ID"
diff --git a/packages/google/google_server.js b/packages/google/google_server.js
index b4dd6f2fd4..8234cc346a 100644
--- a/packages/google/google_server.js
+++ b/packages/google/google_server.js
@@ -47,7 +47,7 @@ var getTokens = function (query) {
code: query.code,
client_id: config.clientId,
client_secret: OAuth.openSecret(config.secret),
- redirect_uri: Meteor.absoluteUrl("_oauth/google?close"),
+ redirect_uri: OAuth._redirectUri('google', config),
grant_type: 'authorization_code'
}});
} catch (err) {
diff --git a/packages/google/package.js b/packages/google/package.js
index 016be5cdcc..67c950d298 100644
--- a/packages/google/package.js
+++ b/packages/google/package.js
@@ -1,6 +1,6 @@
Package.describe({
summary: "Google OAuth flow",
- version: "1.0.0"
+ version: "1.0.1-rc0"
});
Package.on_use(function(api) {
diff --git a/packages/htmljs/package.js b/packages/htmljs/package.js
index b768ec81ae..a0b049bf3a 100644
--- a/packages/htmljs/package.js
+++ b/packages/htmljs/package.js
@@ -1,9 +1,10 @@
Package.describe({
summary: "Small library for expressing HTML trees",
- version: '1.0.0'
+ version: '1.0.0-cordova1'
});
Package.on_use(function (api) {
+ api.use('deps');
api.export('HTML');
api.add_files(['preamble.js',
diff --git a/packages/http/httpcall_client.js b/packages/http/httpcall_client.js
index 41f38be5db..d08070aba5 100644
--- a/packages/http/httpcall_client.js
+++ b/packages/http/httpcall_client.js
@@ -46,9 +46,7 @@ HTTP.call = function(method, url, options, callback) {
else
params_for_body = options.params;
- var query_match = /^(.*?)(\?.*)?$/.exec(url);
- url = buildUrl(query_match[1], query_match[2],
- options.query, params_for_url);
+ url = URL._constructUrl(url, options.query, params_for_url);
if (options.followRedirects === false)
throw new Error("Option followRedirects:false not supported on client.");
@@ -63,7 +61,7 @@ HTTP.call = function(method, url, options, callback) {
}
if (params_for_body) {
- content = encodeParams(params_for_body);
+ content = URL._encodeParams(params_for_body);
}
_.extend(headers, options.headers || {});
diff --git a/packages/http/httpcall_common.js b/packages/http/httpcall_common.js
index 5b6c4f9b66..3080f5a467 100644
--- a/packages/http/httpcall_common.js
+++ b/packages/http/httpcall_common.js
@@ -12,41 +12,6 @@ makeErrorByStatus = function(statusCode, content) {
return new Error(message);
};
-encodeParams = function(params) {
- var buf = [];
- _.each(params, function(value, key) {
- if (buf.length)
- buf.push('&');
- buf.push(encodeString(key), '=', encodeString(value));
- });
- return buf.join('').replace(/%20/g, '+');
-};
-
-encodeString = function(str) {
- return encodeURIComponent(str).replace(/[!'()]/g, escape).replace(/\*/g, "%2A");
-};
-
-buildUrl = function(before_qmark, from_qmark, opt_query, opt_params) {
- var url_without_query = before_qmark;
- var query = from_qmark ? from_qmark.slice(1) : null;
-
- if (typeof opt_query === "string")
- query = String(opt_query);
-
- if (opt_params) {
- query = query || "";
- var prms = encodeParams(opt_params);
- if (query && prms)
- query += '&';
- query += prms;
- }
-
- var url = url_without_query;
- if (query !== null)
- url += ("?"+query);
-
- return url;
-};
// Fill in `response.data` if the content-type is JSON.
populateData = function(response) {
diff --git a/packages/http/httpcall_server.js b/packages/http/httpcall_server.js
index 212508367f..81a082adbf 100644
--- a/packages/http/httpcall_server.js
+++ b/packages/http/httpcall_server.js
@@ -21,8 +21,6 @@ var _call = function(method, url, options, callback) {
if (! /^https?:\/\//.test(url))
throw new Error("url must be absolute and start with http:// or https://");
- var url_parts = url_util.parse(url);
-
var headers = {};
var content = options.content;
@@ -38,9 +36,7 @@ var _call = function(method, url, options, callback) {
else
params_for_body = options.params;
- var new_url = buildUrl(
- url_parts.protocol + "//" + url_parts.host + url_parts.pathname,
- url_parts.search, options.query, params_for_url);
+ var new_url = URL._constructUrl(url, options.query, params_for_url);
if (options.auth) {
if (options.auth.indexOf(':') < 0)
@@ -50,7 +46,7 @@ var _call = function(method, url, options, callback) {
}
if (params_for_body) {
- content = encodeParams(params_for_body);
+ content = URL._encodeParams(params_for_body);
headers['Content-Type'] = "application/x-www-form-urlencoded";
}
diff --git a/packages/http/httpcall_tests.js b/packages/http/httpcall_tests.js
index 24f0ab7640..2401140801 100644
--- a/packages/http/httpcall_tests.js
+++ b/packages/http/httpcall_tests.js
@@ -451,7 +451,7 @@ if (Meteor.isServer) {
};
// existing static file
- do_test("/packages/local-test:http/test_static.serveme", 200, /static file serving/);
+ do_test("/packages/local-test_http/test_static.serveme", 200, /static file serving/);
// no such file, so return the default app HTML.
var getsAppHtml = [
diff --git a/packages/http/package.js b/packages/http/package.js
index b9306dcd27..6b2196c76e 100644
--- a/packages/http/package.js
+++ b/packages/http/package.js
@@ -1,12 +1,13 @@
Package.describe({
summary: "Make HTTP calls to remote servers",
- version: '1.0.3'
+ version: '1.0.4-rc0'
});
Npm.depends({request: "2.33.0"});
Package.on_use(function (api) {
api.use('underscore');
+ api.use('url');
api.export('HTTP');
api.add_files('httpcall_common.js', ['client', 'server']);
api.add_files('httpcall_client.js', 'client');
diff --git a/packages/jquery-layout/package.js b/packages/jquery-layout/package.js
index f131b83914..6204f9aa03 100644
--- a/packages/jquery-layout/package.js
+++ b/packages/jquery-layout/package.js
@@ -3,7 +3,7 @@
Package.describe({
summary: "Easily create arbitrary multicolumn layouts",
- version: "1.0.0"
+ version: "1.0.1-rc0"
});
Package.on_use(function (api) {
diff --git a/packages/less/package.js b/packages/less/package.js
index 07ab1bf474..7ef713c042 100644
--- a/packages/less/package.js
+++ b/packages/less/package.js
@@ -1,6 +1,6 @@
Package.describe({
summary: "The dynamic stylesheet language",
- version: "1.0.6"
+ version: "1.0.8-cordova6"
});
Package._transitional_registerBuildPlugin({
diff --git a/packages/livedata/package.js b/packages/livedata/package.js
index 1b6827e219..f2ad5a8931 100644
--- a/packages/livedata/package.js
+++ b/packages/livedata/package.js
@@ -1,98 +1,8 @@
Package.describe({
- summary: "Meteor's latency-compensated distributed data framework",
- version: '1.0.7'
-});
-
-// We use 'faye-websocket' for connections in server-to-server DDP, mostly
-// because it's the same library used as a server in sockjs, and it's easiest to
-// deal with a single websocket implementation. (Plus, its maintainer is easy
-// to work with on pull requests.)
-//
-// (By listing faye-websocket first, it's more likely that npm deduplication
-// will prevent a second copy of faye-websocket from being installed inside
-// sockjs.)
-Npm.depends({
- // A fork fixing https://github.com/faye/websocket-driver-node/pull/8 (ie
- // "open from inactive client" errors). Note that sockjs won't use this fork,
- // but the bug only affects the websocket client, not the server.
- "faye-websocket": "https://github.com/meteor/faye-websocket-node/tarball/ccc180998b1396093c24d0df7ebc1d199c276552",
- sockjs: "0.3.9"
+ summary: "Moved to the 'ddp' package",
+ version: '1.0.8-rc0'
});
Package.on_use(function (api) {
- api.use(['check', 'random', 'ejson', 'json', 'underscore', 'tracker',
- 'logging', 'retry'],
- ['client', 'server']);
-
- // It is OK to use this package on a server architecture without making a
- // server (in order to do server-to-server DDP as a client). So these are only
- // included as weak dependencies.
- // XXX split this package into multiple packages or multiple slices instead
- api.use(['webapp', 'routepolicy'], 'server', {weak: true});
-
- // Detect whether or not the user wants us to audit argument checks.
- api.use(['audit-argument-checks'], 'server', {weak: true});
-
- // Allow us to detect 'autopublish', so we can print a warning if the user
- // runs Meteor.publish while it's loaded.
- api.use('autopublish', 'server', {weak: true});
-
- // If the facts package is loaded, publish some statistics.
- api.use('facts', 'server', {weak: true});
-
- api.use('callback-hook', 'server');
-
- api.export('DDP');
- api.export('DDPServer', 'server');
-
- api.export('LivedataTest', {testOnly: true});
-
- // Transport
- api.use('reload', 'client', {weak: true});
- api.add_files('common.js');
- api.add_files(['sockjs-0.3.4.js', 'stream_client_sockjs.js'], 'client');
- api.add_files('stream_client_nodejs.js', 'server');
- api.add_files('stream_client_common.js', ['client', 'server']);
- api.add_files('stream_server.js', 'server');
-
- // we depend on LocalCollection._diffObjects, _applyChanges,
- // _idParse, _idStringify.
- api.use('minimongo', ['client', 'server']);
-
- api.add_files('heartbeat.js', ['client', 'server']);
-
- api.add_files('livedata_server.js', 'server');
-
- api.add_files('writefence.js', 'server');
- api.add_files('crossbar.js', 'server');
-
- api.add_files('livedata_common.js', ['client', 'server']);
- api.add_files('random_stream.js', ['client', 'server']);
-
- api.add_files('livedata_connection.js', ['client', 'server']);
-
-
- api.add_files('client_convenience.js', 'client');
- api.add_files('server_convenience.js', 'server');
-});
-
-Package.on_test(function (api) {
- api.use('livedata', ['client', 'server']);
- api.use('mongo-livedata', ['client', 'server']);
- api.use('test-helpers', ['client', 'server']);
- api.use(['underscore', 'tinytest', 'random', 'tracker', 'minimongo', 'reactive-var']);
-
- api.add_files('stub_stream.js');
- api.add_files('livedata_server_tests.js', 'server');
- api.add_files('livedata_connection_tests.js', ['client', 'server']);
- api.add_files('livedata_tests.js', ['client', 'server']);
- api.add_files('livedata_test_service.js', ['client', 'server']);
- api.add_files('session_view_tests.js', ['server']);
- api.add_files('crossbar_tests.js', ['server']);
- api.add_files('random_stream_tests.js', ['client', 'server']);
-
- api.use('http', 'client');
- api.add_files(['stream_tests.js'], 'client');
- api.add_files('stream_client_tests.js', 'server');
- api.use('check', ['client', 'server']);
+ api.imply("ddp");
});
diff --git a/packages/logging/logging.js b/packages/logging/logging.js
index 80a254ffe3..4257d678a1 100644
--- a/packages/logging/logging.js
+++ b/packages/logging/logging.js
@@ -235,9 +235,12 @@ Log.format = function (obj, options) {
if (originApp && originApp !== appName) appInfo += ' via ' + originApp;
if (appInfo) appInfo = '[' + appInfo + '] ';
- var sourceInfo = (file && lineNumber) ?
- ['(', (program ? program + ':' : ''), file, ':', lineNumber, ') '].join('')
- : '';
+ var sourceInfoParts = [];
+ if (program) sourceInfoParts.push(program);
+ if (file) sourceInfoParts.push(file);
+ if (lineNumber) sourceInfoParts.push(lineNumber);
+ var sourceInfo = _.isEmpty(sourceInfoParts) ?
+ '' : '(' + sourceInfoParts.join(':') + ') ';
if (satellite)
sourceInfo += ['[', satellite, ']'].join('');
@@ -260,8 +263,8 @@ Log.format = function (obj, options) {
Npm.require('cli-color')[color](line) : line;
};
- return prettify(metaPrefix, META_COLOR)
- + prettify(message, LEVEL_COLORS[level]);
+ return prettify(metaPrefix, options.metaColor || META_COLOR) +
+ prettify(message, LEVEL_COLORS[level]);
};
// Turn a line of text into a loggable object.
diff --git a/packages/logging/logging_cordova.js b/packages/logging/logging_cordova.js
new file mode 100644
index 0000000000..56f52ceba8
--- /dev/null
+++ b/packages/logging/logging_cordova.js
@@ -0,0 +1,12 @@
+// Log all uncaught errors so they can be printed to the developer.
+// But since Android's adb catlog already prints the uncaught exceptions, we
+// can disable it for Android.
+if (! /Android/i.test(navigator.userAgent)) {
+ window.onerror = function (msg, url, line) {
+ // Cut off the url prefix, the meaningful part always starts at 'www/' in
+ // Cordova apps.
+ url = url.replace(/^.*?\/www\//, '');
+ console.log('Uncaught Error: ' + msg + ':' + line + ':' + url);
+ };
+}
+
diff --git a/packages/logging/logging_test.js b/packages/logging/logging_test.js
index b00b0d3c36..255b7747a2 100644
--- a/packages/logging/logging_test.js
+++ b/packages/logging/logging_test.js
@@ -4,7 +4,8 @@ Tinytest.add("logging - _getCallerDetails", function (test) {
// in Chrome and Firefox, other browsers don't give us an ability to get
// stacktrace.
if ((new Error).stack) {
- test.equal(details.file, 'tinytest.js');
+ test.equal(details.file, Meteor.isServer ?
+ 'tinytest.js' : 'local-test_logging.js');
// evaled statements shouldn't crash
var code = "Log._getCallerDetails().file";
diff --git a/packages/logging/package.js b/packages/logging/package.js
index 9d9aa4130a..76b6a717fc 100644
--- a/packages/logging/package.js
+++ b/packages/logging/package.js
@@ -1,16 +1,21 @@
Package.describe({
summary: "Logging facility.",
- version: '1.0.2'
+ version: '1.0.2-cordova2'
});
Npm.depends({
"cli-color": "0.2.3"
});
+Cordova.depends({
+ 'org.apache.cordova.console': '0.2.10'
+});
+
Package.on_use(function (api) {
api.export('Log');
api.use(['underscore', 'ejson']);
api.add_files('logging.js');
+ api.add_files('logging_cordova.js', 'web.cordova');
});
Package.on_test(function (api) {
diff --git a/packages/meetup/meetup_client.js b/packages/meetup/meetup_client.js
index 843b6ce428..e6bb55b3ed 100644
--- a/packages/meetup/meetup_client.js
+++ b/packages/meetup/meetup_client.js
@@ -27,22 +27,27 @@ Meetup.requestCredential = function (options, credentialRequestCompleteCallback)
var scope = (options && options.requestPermissions) || [];
var flatScope = _.map(scope, encodeURIComponent).join('+');
+ var loginStyle = OAuth._loginStyle('meetup', config, options);
+
var loginUrl =
'https://secure.meetup.com/oauth2/authorize' +
'?client_id=' + config.clientId +
'&response_type=code' +
'&scope=' + flatScope +
- '&redirect_uri=' + Meteor.absoluteUrl('_oauth/meetup?close') +
- '&state=' + credentialToken;
+ '&redirect_uri=' + OAuth._redirectUri('meetup', config) +
+ '&state=' + OAuth._stateParam(loginStyle, credentialToken);
// meetup box gets taller when permissions requested.
var height = 620;
if (_.without(scope, 'basic').length)
height += 130;
- OAuth.showPopup(
- loginUrl,
- _.bind(credentialRequestCompleteCallback, null, credentialToken),
- {width: 900, height: height}
- );
+ OAuth.launchLogin({
+ loginService: "meetup",
+ loginStyle: loginStyle,
+ loginUrl: loginUrl,
+ credentialRequestCompleteCallback: credentialRequestCompleteCallback,
+ credentialToken: credentialToken,
+ popupOptions: {width: 900, height: height}
+ });
};
diff --git a/packages/meetup/meetup_server.js b/packages/meetup/meetup_server.js
index b51c9821f0..acd3848aab 100644
--- a/packages/meetup/meetup_server.js
+++ b/packages/meetup/meetup_server.js
@@ -27,7 +27,7 @@ var getAccessToken = function (query) {
client_id: config.clientId,
client_secret: OAuth.openSecret(config.secret),
grant_type: 'authorization_code',
- redirect_uri: Meteor.absoluteUrl("_oauth/meetup?close"),
+ redirect_uri: OAuth._redirectUri('meetup', config),
state: query.state
}});
} catch (err) {
diff --git a/packages/meetup/package.js b/packages/meetup/package.js
index f16191a01f..626a21ca6f 100644
--- a/packages/meetup/package.js
+++ b/packages/meetup/package.js
@@ -1,6 +1,6 @@
Package.describe({
summary: "Meetup OAuth flow",
- version: "1.0.1"
+ version: "1.0.2-rc0"
});
Package.on_use(function(api) {
diff --git a/packages/meteor-developer/meteor_developer_client.js b/packages/meteor-developer/meteor_developer_client.js
index ebb0d96432..799b44e831 100644
--- a/packages/meteor-developer/meteor_developer_client.js
+++ b/packages/meteor-developer/meteor_developer_client.js
@@ -20,26 +20,28 @@ var requestCredential = function (options, credentialRequestCompleteCallback) {
var credentialToken = Random.secret();
+ var loginStyle = OAuth._loginStyle('facebook', config, options);
+
var loginUrl =
MeteorDeveloperAccounts._server +
"/oauth2/authorize?" +
- "state=" + credentialToken +
+ "state=" + OAuth._stateParam(loginStyle, credentialToken) +
"&response_type=code&" +
"client_id=" + config.clientId;
if (options && options.userEmail)
loginUrl += '&user_email=' + encodeURIComponent(options.userEmail);
- loginUrl += "&redirect_uri=" + Meteor.absoluteUrl("_oauth/meteor-developer?close");
+ loginUrl += "&redirect_uri=" + OAuth._redirectUri('meteor-developer', config);
- OAuth.showPopup(
- loginUrl,
- _.bind(credentialRequestCompleteCallback, null, credentialToken),
- {
- width: 470,
- height: 420
- }
- );
+ OAuth.launchLogin({
+ loginService: "meteor-developer",
+ loginStyle: loginStyle,
+ loginUrl: loginUrl,
+ credentialRequestCompleteCallback: credentialRequestCompleteCallback,
+ credentialToken: credentialToken,
+ popupOptions: {width: 470, height: 420}
+ });
};
MeteorDeveloperAccounts.requestCredential = requestCredential;
diff --git a/packages/meteor-developer/meteor_developer_configure.html b/packages/meteor-developer/meteor_developer_configure.html
index 5672891087..719c7d73dd 100644
--- a/packages/meteor-developer/meteor_developer_configure.html
+++ b/packages/meteor-developer/meteor_developer_configure.html
@@ -10,7 +10,7 @@
and give your app a name.
Add
- {{siteUrl}}_oauth/meteor-developer?close
+ {{siteUrl}}_oauth/meteor-developer
as an Allowed Redirect URL.
diff --git a/packages/meteor-developer/meteor_developer_server.js b/packages/meteor-developer/meteor_developer_server.js
index 61d789782e..77cc7c966f 100644
--- a/packages/meteor-developer/meteor_developer_server.js
+++ b/packages/meteor-developer/meteor_developer_server.js
@@ -44,7 +44,7 @@ var getTokens = function (query) {
code: query.code,
client_id: config.clientId,
client_secret: OAuth.openSecret(config.secret),
- redirect_uri: Meteor.absoluteUrl("_oauth/meteor-developer?close")
+ redirect_uri: OAuth._redirectUri('meteor-developer', config)
}
}
);
diff --git a/packages/meteor-developer/package.js b/packages/meteor-developer/package.js
index 857a905227..f5a6af38e9 100644
--- a/packages/meteor-developer/package.js
+++ b/packages/meteor-developer/package.js
@@ -1,6 +1,6 @@
Package.describe({
summary: "Meteor developer accounts OAuth flow",
- version: "1.0.0"
+ version: "1.0.1-rc0"
});
Package.on_use(function (api) {
diff --git a/packages/meteor-platform/package.js b/packages/meteor-platform/package.js
index 8293db529b..d1aa4ba354 100644
--- a/packages/meteor-platform/package.js
+++ b/packages/meteor-platform/package.js
@@ -1,6 +1,6 @@
Package.describe({
summary: "Include a standard set of Meteor packages in your app",
- version: '1.0.0'
+ version: '1.0.1-rc0'
});
Package.on_use(function(api) {
@@ -25,9 +25,9 @@ Package.on_use(function(api) {
// The easiest way to get a little reactivity into your app.
'session',
// DDP: Meteor's client/server protocol.
- 'livedata',
+ 'ddp',
// You want to keep your data somewhere? How about MongoDB?
- 'mongo-livedata',
+ 'mongo',
// Blaze: Reactive DOM!
'blaze',
// A great template language!
@@ -54,4 +54,15 @@ Package.on_use(function(api) {
// And update automatically when new client code is available!
'autoupdate'
], ['client', 'server']);
+
+ api.use([
+ // Remove the 300ms click delay on mobile
+ 'fastclick',
+ // Good defaults for the mobile status bar
+ 'mobile-status-bar'
+ ], 'web.cordova');
+});
+
+Cordova.depends({
+ 'org.apache.cordova.device': '0.2.11'
});
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index 3dc57a768a..d76fd129a0 100644
--- a/packages/meteor-tool/package.js
+++ b/packages/meteor-tool/package.js
@@ -1,6 +1,6 @@
Package.describe({
summary: "The Meteor command-line tool",
- version: '1.0.26'
+ version: '1.0.28-cordova6'
});
Package.includeTool();
diff --git a/packages/meteor/browser_environment_test.js b/packages/meteor/browser_environment_test.js
new file mode 100644
index 0000000000..cd31ec479d
--- /dev/null
+++ b/packages/meteor/browser_environment_test.js
@@ -0,0 +1,5 @@
+Tinytest.add("environment - browser basics", function (test) {
+ test.isTrue(Meteor.isClient);
+ test.isFalse(Meteor.isServer);
+ test.isFalse(Meteor.isCordova);
+});
diff --git a/packages/meteor/cordova_environment.js b/packages/meteor/cordova_environment.js
new file mode 100644
index 0000000000..9c3dde5d46
--- /dev/null
+++ b/packages/meteor/cordova_environment.js
@@ -0,0 +1,2 @@
+Meteor.isCordova = true;
+
diff --git a/packages/meteor/cordova_environment_test.js b/packages/meteor/cordova_environment_test.js
new file mode 100644
index 0000000000..88191a7178
--- /dev/null
+++ b/packages/meteor/cordova_environment_test.js
@@ -0,0 +1,6 @@
+Tinytest.add("environment - cordova basics", function (test) {
+ test.isFalse(Meteor.isServer);
+ test.isTrue(Meteor.isClient);
+ test.isTrue(Meteor.isCordova);
+});
+
diff --git a/packages/meteor/package.js b/packages/meteor/package.js
index 939fbb3f8d..1831577b8e 100644
--- a/packages/meteor/package.js
+++ b/packages/meteor/package.js
@@ -2,7 +2,7 @@
Package.describe({
summary: "Core Meteor environment",
- version: '1.0.2'
+ version: '1.0.4-cordova6'
});
Package._transitional_registerBuildPlugin({
@@ -16,6 +16,7 @@ Package.on_use(function (api) {
api.export('Meteor');
api.add_files('client_environment.js', 'client');
+ api.add_files('cordova_environment.js', 'web.cordova');
api.add_files('server_environment.js', 'server');
api.add_files('helpers.js', ['client', 'server']);
api.add_files('setimmediate.js', ['client', 'server']);
@@ -41,7 +42,9 @@ Package.on_use(function (api) {
Package.on_test(function (api) {
api.use(['underscore', 'tinytest', 'test-helpers']);
+ api.add_files('browser_environment_test.js', 'web.browser');
api.add_files('client_environment_test.js', 'client');
+ api.add_files('cordova_environment_test.js', 'web.cordova');
api.add_files('server_environment_test.js', 'server');
api.add_files('helpers_test.js', ['client', 'server']);
diff --git a/packages/meteor/server_environment_test.js b/packages/meteor/server_environment_test.js
index 406529ee84..2b4a6c7531 100644
--- a/packages/meteor/server_environment_test.js
+++ b/packages/meteor/server_environment_test.js
@@ -1,4 +1,5 @@
Tinytest.add("environment - server basics", function (test) {
test.isFalse(Meteor.isClient);
test.isTrue(Meteor.isServer);
+ test.isFalse(Meteor.isCordova);
});
diff --git a/packages/meteor/startup_client.js b/packages/meteor/startup_client.js
index eb3c8d1e23..7590a922c7 100644
--- a/packages/meteor/startup_client.js
+++ b/packages/meteor/startup_client.js
@@ -1,6 +1,6 @@
var queue = [];
-var loaded = document.readyState === "loaded" ||
- document.readyState == "complete";
+var loaded = !Meteor.isCordova &&
+ (document.readyState === "loaded" || document.readyState == "complete");
var ready = function() {
loaded = true;
@@ -9,7 +9,8 @@ var ready = function() {
};
if (document.addEventListener) {
- document.addEventListener('DOMContentLoaded', ready, false);
+ var event = Meteor.isCordova ? 'meteor-cordova-loaded' : 'DOMContentLoaded';
+ document.addEventListener(event, ready, false);
window.addEventListener('load', ready, false);
} else {
document.attachEvent('onreadystatechange', function () {
diff --git a/packages/meteor/timers.js b/packages/meteor/timers.js
index cc0827e5c6..5bc22b73dd 100644
--- a/packages/meteor/timers.js
+++ b/packages/meteor/timers.js
@@ -1,6 +1,6 @@
var withoutInvocation = function (f) {
- if (Package.livedata) {
- var _CurrentInvocation = Package.livedata.DDP._CurrentInvocation;
+ if (Package.ddp) {
+ var _CurrentInvocation = Package.ddp.DDP._CurrentInvocation;
if (_CurrentInvocation.get() && _CurrentInvocation.get().isSimulation)
throw new Error("Can't set timers inside simulations");
return function () { _CurrentInvocation.withValue(null, f); };
diff --git a/packages/minifiers/minifiers.js b/packages/minifiers/minifiers.js
index 189e5392e6..8e3df8f70b 100644
--- a/packages/minifiers/minifiers.js
+++ b/packages/minifiers/minifiers.js
@@ -14,7 +14,7 @@ CssTools = {
minifyCssAst: function (cssAst) {
return MinifyAst(cssAst);
},
- mergeCssAsts: function (cssAsts, warnCb) {
+ mergeCssAsts: function (cssAsts, warnCb, shouldKeepRelPaths) {
var rulesPredicate = function (rules) {
if (! _.isArray(rules))
rules = [rules];
@@ -54,7 +54,9 @@ CssTools = {
break;
}
- CssTools.rewriteCssUrls(ast);
+ if (! shouldKeepRelPaths) {
+ CssTools.rewriteCssUrls(ast);
+ }
var imports = ast.stylesheet.rules.splice(0, importCount);
newAst.stylesheet.rules = newAst.stylesheet.rules.concat(imports);
diff --git a/packages/minimongo/diff.js b/packages/minimongo/diff.js
index 1ccfa282a3..bccd6f8bcb 100644
--- a/packages/minimongo/diff.js
+++ b/packages/minimongo/diff.js
@@ -1,4 +1,3 @@
-
// ordered: bool.
// old_results and new_results: collections of documents.
// if ordered, they are arrays.
diff --git a/packages/minimongo/package.js b/packages/minimongo/package.js
index 28904c2d87..79d5884dbd 100644
--- a/packages/minimongo/package.js
+++ b/packages/minimongo/package.js
@@ -1,6 +1,6 @@
Package.describe({
summary: "Meteor's client-side datastore: a port of MongoDB to Javascript",
- version: '1.0.1'
+ version: '1.0.2-rc0'
});
Package.on_use(function (api) {
diff --git a/packages/mobile-status-bar/.gitignore b/packages/mobile-status-bar/.gitignore
new file mode 100644
index 0000000000..677a6fc263
--- /dev/null
+++ b/packages/mobile-status-bar/.gitignore
@@ -0,0 +1 @@
+.build*
diff --git a/packages/mobile-status-bar/mobile-status-bar.js b/packages/mobile-status-bar/mobile-status-bar.js
new file mode 100644
index 0000000000..db74b2ce9b
--- /dev/null
+++ b/packages/mobile-status-bar/mobile-status-bar.js
@@ -0,0 +1,4 @@
+StatusBar.overlaysWebView(false);
+StatusBar.show();
+StatusBar.styleDefault();
+StatusBar.backgroundColorByName('white');
\ No newline at end of file
diff --git a/packages/mobile-status-bar/package.js b/packages/mobile-status-bar/package.js
new file mode 100644
index 0000000000..1b20a0a72a
--- /dev/null
+++ b/packages/mobile-status-bar/package.js
@@ -0,0 +1,12 @@
+Package.describe({
+ summary: "Good defaults for the mobile status bar",
+ version: "1.0.0-cordova2"
+});
+
+Package.onUse(function(api) {
+ api.addFiles('mobile-status-bar.js', 'web.cordova');
+});
+
+Cordova.depends({
+ 'org.apache.cordova.statusbar': '0.1.7'
+});
\ No newline at end of file
diff --git a/packages/mongo-livedata/package.js b/packages/mongo-livedata/package.js
index 47048551c5..83a8214dd1 100644
--- a/packages/mongo-livedata/package.js
+++ b/packages/mongo-livedata/package.js
@@ -1,76 +1,8 @@
-// XXX We should revisit how we factor MongoDB support into (1) the
-// server-side node.js driver [which you might use independently of
-// livedata, after all], (2) minimongo [ditto], and (3) Collection,
-// which is the class that glues the two of them to Livedata, but also
-// is generally the "public interface for newbies" to Mongo in the
-// Meteor universe. We want to allow the components to be used
-// independently, but we don't want to overwhelm the user with
-// minutiae.
-
Package.describe({
- summary: "Adaptor for using MongoDB and Minimongo over DDP",
- version: '1.0.3'
-});
-
-Npm.depends({
- mongodb: "https://github.com/meteor/node-mongodb-native/tarball/cbd6220ee17c3178d20672b4a1df80f82f97d4c1"
+ summary: "Moved to the 'mongo' package",
+ version: '1.0.4-rc0'
});
Package.on_use(function (api) {
- api.use(['random', 'ejson', 'json', 'underscore', 'minimongo', 'logging',
- 'livedata', 'tracker', 'application-configuration'],
- ['client', 'server']);
- api.use('check', ['client', 'server']);
-
- // Binary Heap data structure is used to optimize oplog observe driver
- // performance.
- api.use('binary-heap', 'server');
-
- // Allow us to detect 'insecure'.
- api.use('insecure', {weak: true});
-
- // Allow us to detect 'autopublish', and publish collections if it's loaded.
- api.use('autopublish', 'server', {weak: true});
-
- // Allow us to detect 'disable-oplog', which turns off oplog tailing for your
- // app even if it's configured in the environment. (This package will be
- // probably be removed before 1.0.)
- api.use('disable-oplog', 'server', {weak: true});
-
- // defaultRemoteCollectionDriver gets its deployConfig from something that is
- // (for questionable reasons) initialized by the webapp package.
- api.use('webapp', 'server', {weak: true});
-
- // If the facts package is loaded, publish some statistics.
- api.use('facts', 'server', {weak: true});
-
- api.use('callback-hook', 'server');
-
- // Stuff that should be exposed via a real API, but we haven't yet.
- api.export('MongoInternals', 'server');
- // For tests only.
- api.export('MongoTest', 'server', {testOnly: true});
-
- api.add_files(['mongo_driver.js', 'oplog_tailing.js',
- 'observe_multiplex.js', 'doc_fetcher.js',
- 'polling_observe_driver.js','oplog_observe_driver.js'],
- 'server');
- api.add_files('local_collection_driver.js', ['client', 'server']);
- api.add_files('remote_collection_driver.js', 'server');
- api.add_files('collection.js', ['client', 'server']);
-});
-
-Package.on_test(function (api) {
- api.use('mongo-livedata');
- api.use('check');
- api.use(['tinytest', 'underscore', 'test-helpers', 'ejson', 'random',
- 'livedata']);
- // XXX test order dependency: the allow_tests "partial allow" test
- // fails if it is run before mongo_livedata_tests.
- api.add_files('mongo_livedata_tests.js', ['client', 'server']);
- api.add_files('allow_tests.js', ['client', 'server']);
- api.add_files('collection_tests.js', ['client', 'server']);
- api.add_files('observe_changes_tests.js', ['client', 'server']);
- api.add_files('oplog_tests.js', 'server');
- api.add_files('doc_fetcher_tests.js', 'server');
+ api.imply("mongo");
});
diff --git a/packages/mongo/.gitignore b/packages/mongo/.gitignore
new file mode 100644
index 0000000000..677a6fc263
--- /dev/null
+++ b/packages/mongo/.gitignore
@@ -0,0 +1 @@
+.build*
diff --git a/packages/mongo-livedata/.npm/package/.gitignore b/packages/mongo/.npm/package/.gitignore
similarity index 100%
rename from packages/mongo-livedata/.npm/package/.gitignore
rename to packages/mongo/.npm/package/.gitignore
diff --git a/packages/mongo-livedata/.npm/package/README b/packages/mongo/.npm/package/README
similarity index 100%
rename from packages/mongo-livedata/.npm/package/README
rename to packages/mongo/.npm/package/README
diff --git a/packages/mongo-livedata/.npm/package/npm-shrinkwrap.json b/packages/mongo/.npm/package/npm-shrinkwrap.json
similarity index 100%
rename from packages/mongo-livedata/.npm/package/npm-shrinkwrap.json
rename to packages/mongo/.npm/package/npm-shrinkwrap.json
diff --git a/packages/mongo-livedata/allow_tests.js b/packages/mongo/allow_tests.js
similarity index 100%
rename from packages/mongo-livedata/allow_tests.js
rename to packages/mongo/allow_tests.js
diff --git a/packages/mongo-livedata/collection.js b/packages/mongo/collection.js
similarity index 100%
rename from packages/mongo-livedata/collection.js
rename to packages/mongo/collection.js
diff --git a/packages/mongo-livedata/collection_tests.js b/packages/mongo/collection_tests.js
similarity index 100%
rename from packages/mongo-livedata/collection_tests.js
rename to packages/mongo/collection_tests.js
diff --git a/packages/mongo-livedata/doc_fetcher.js b/packages/mongo/doc_fetcher.js
similarity index 100%
rename from packages/mongo-livedata/doc_fetcher.js
rename to packages/mongo/doc_fetcher.js
diff --git a/packages/mongo-livedata/doc_fetcher_tests.js b/packages/mongo/doc_fetcher_tests.js
similarity index 100%
rename from packages/mongo-livedata/doc_fetcher_tests.js
rename to packages/mongo/doc_fetcher_tests.js
diff --git a/packages/mongo-livedata/local_collection_driver.js b/packages/mongo/local_collection_driver.js
similarity index 100%
rename from packages/mongo-livedata/local_collection_driver.js
rename to packages/mongo/local_collection_driver.js
diff --git a/packages/mongo-livedata/mongo_driver.js b/packages/mongo/mongo_driver.js
similarity index 100%
rename from packages/mongo-livedata/mongo_driver.js
rename to packages/mongo/mongo_driver.js
diff --git a/packages/mongo-livedata/mongo_livedata_tests.js b/packages/mongo/mongo_livedata_tests.js
similarity index 100%
rename from packages/mongo-livedata/mongo_livedata_tests.js
rename to packages/mongo/mongo_livedata_tests.js
diff --git a/packages/mongo-livedata/observe_changes_tests.js b/packages/mongo/observe_changes_tests.js
similarity index 100%
rename from packages/mongo-livedata/observe_changes_tests.js
rename to packages/mongo/observe_changes_tests.js
diff --git a/packages/mongo-livedata/observe_multiplex.js b/packages/mongo/observe_multiplex.js
similarity index 100%
rename from packages/mongo-livedata/observe_multiplex.js
rename to packages/mongo/observe_multiplex.js
diff --git a/packages/mongo-livedata/oplog_observe_driver.js b/packages/mongo/oplog_observe_driver.js
similarity index 100%
rename from packages/mongo-livedata/oplog_observe_driver.js
rename to packages/mongo/oplog_observe_driver.js
diff --git a/packages/mongo-livedata/oplog_tailing.js b/packages/mongo/oplog_tailing.js
similarity index 100%
rename from packages/mongo-livedata/oplog_tailing.js
rename to packages/mongo/oplog_tailing.js
diff --git a/packages/mongo-livedata/oplog_tests.js b/packages/mongo/oplog_tests.js
similarity index 100%
rename from packages/mongo-livedata/oplog_tests.js
rename to packages/mongo/oplog_tests.js
diff --git a/packages/mongo/package.js b/packages/mongo/package.js
new file mode 100644
index 0000000000..246b77bc43
--- /dev/null
+++ b/packages/mongo/package.js
@@ -0,0 +1,76 @@
+// XXX We should revisit how we factor MongoDB support into (1) the
+// server-side node.js driver [which you might use independently of
+// livedata, after all], (2) minimongo [ditto], and (3) Collection,
+// which is the class that glues the two of them to Livedata, but also
+// is generally the "public interface for newbies" to Mongo in the
+// Meteor universe. We want to allow the components to be used
+// independently, but we don't want to overwhelm the user with
+// minutiae.
+
+Package.describe({
+ summary: "Adaptor for using MongoDB and Minimongo over DDP",
+ version: '1.0.3'
+});
+
+Npm.depends({
+ mongodb: "https://github.com/meteor/node-mongodb-native/tarball/cbd6220ee17c3178d20672b4a1df80f82f97d4c1"
+});
+
+Package.on_use(function (api) {
+ api.use(['random', 'ejson', 'json', 'underscore', 'minimongo', 'logging',
+ 'ddp', 'tracker', 'application-configuration'],
+ ['client', 'server']);
+ api.use('check', ['client', 'server']);
+
+ // Binary Heap data structure is used to optimize oplog observe driver
+ // performance.
+ api.use('binary-heap', 'server');
+
+ // Allow us to detect 'insecure'.
+ api.use('insecure', {weak: true});
+
+ // Allow us to detect 'autopublish', and publish collections if it's loaded.
+ api.use('autopublish', 'server', {weak: true});
+
+ // Allow us to detect 'disable-oplog', which turns off oplog tailing for your
+ // app even if it's configured in the environment. (This package will be
+ // probably be removed before 1.0.)
+ api.use('disable-oplog', 'server', {weak: true});
+
+ // defaultRemoteCollectionDriver gets its deployConfig from something that is
+ // (for questionable reasons) initialized by the webapp package.
+ api.use('webapp', 'server', {weak: true});
+
+ // If the facts package is loaded, publish some statistics.
+ api.use('facts', 'server', {weak: true});
+
+ api.use('callback-hook', 'server');
+
+ // Stuff that should be exposed via a real API, but we haven't yet.
+ api.export('MongoInternals', 'server');
+ // For tests only.
+ api.export('MongoTest', 'server', {testOnly: true});
+
+ api.add_files(['mongo_driver.js', 'oplog_tailing.js',
+ 'observe_multiplex.js', 'doc_fetcher.js',
+ 'polling_observe_driver.js','oplog_observe_driver.js'],
+ 'server');
+ api.add_files('local_collection_driver.js', ['client', 'server']);
+ api.add_files('remote_collection_driver.js', 'server');
+ api.add_files('collection.js', ['client', 'server']);
+});
+
+Package.on_test(function (api) {
+ api.use('mongo');
+ api.use('check');
+ api.use(['tinytest', 'underscore', 'test-helpers', 'ejson', 'random',
+ 'ddp']);
+ // XXX test order dependency: the allow_tests "partial allow" test
+ // fails if it is run before mongo_livedata_tests.
+ api.add_files('mongo_livedata_tests.js', ['client', 'server']);
+ api.add_files('allow_tests.js', ['client', 'server']);
+ api.add_files('collection_tests.js', ['client', 'server']);
+ api.add_files('observe_changes_tests.js', ['client', 'server']);
+ api.add_files('oplog_tests.js', 'server');
+ api.add_files('doc_fetcher_tests.js', 'server');
+});
diff --git a/packages/mongo-livedata/polling_observe_driver.js b/packages/mongo/polling_observe_driver.js
similarity index 100%
rename from packages/mongo-livedata/polling_observe_driver.js
rename to packages/mongo/polling_observe_driver.js
diff --git a/packages/mongo-livedata/remote_collection_driver.js b/packages/mongo/remote_collection_driver.js
similarity index 100%
rename from packages/mongo-livedata/remote_collection_driver.js
rename to packages/mongo/remote_collection_driver.js
diff --git a/packages/oauth/end_of_login_response.html b/packages/oauth/end_of_login_response.html
deleted file mode 100644
index f4480867d3..0000000000
--- a/packages/oauth/end_of_login_response.html
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
- 
-
-
diff --git a/packages/oauth/end_of_popup_response.html b/packages/oauth/end_of_popup_response.html
new file mode 100644
index 0000000000..7f0d470d04
--- /dev/null
+++ b/packages/oauth/end_of_popup_response.html
@@ -0,0 +1,49 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/packages/oauth/end_of_redirect_response.html b/packages/oauth/end_of_redirect_response.html
new file mode 100644
index 0000000000..59ce2f2fd7
--- /dev/null
+++ b/packages/oauth/end_of_redirect_response.html
@@ -0,0 +1,24 @@
+
+
+
+
+
+ ?"
- var barePath = req.url.substring(0, req.url.indexOf('?'));
+ // req.url will be "/_oauth/" with an optional "?close".
+ var i = req.url.indexOf('?');
+ var barePath;
+ if (i === -1)
+ barePath = req.url;
+ else
+ barePath = req.url.substring(0, i);
var splitPath = barePath.split('/');
// Any non-oauth request will continue down the default
@@ -152,25 +208,27 @@ var isSafe = function (value) {
// Internal: used by the oauth1 and oauth2 packages
OAuth._renderOauthResults = function(res, query, credentialSecret) {
- // We expect the ?close parameter to be present, in which case we
- // close the popup at the end of the OAuth flow. Any other query
- // string should just serve a blank page. For tests, we support the
- // `only_credential_secret_for_test` parameter, which just returns the
- // credential secret without any surrounding HTML. (The test needs to
- // be able to easily grab the secret and use it to log in.)
+ // For tests, we support the `only_credential_secret_for_test`
+ // parameter, which just returns the credential secret without any
+ // surrounding HTML. (The test needs to be able to easily grab the
+ // secret and use it to log in.)
//
// XXX only_credential_secret_for_test could be useful for other
// things beside tests, like command-line clients. We should give it a
// real name and serve the credential secret in JSON.
+
if (query.only_credential_secret_for_test) {
res.writeHead(200, {'Content-Type': 'text/html'});
res.end(credentialSecret, 'utf-8');
} else {
- var details = { query: query };
+ var details = {
+ query: query,
+ loginStyle: OAuth._loginStyleFromQuery(query)
+ };
if (query.error) {
details.error = query.error;
} else {
- var token = query.state;
+ var token = OAuth._credentialTokenFromQuery(query);
var secret = credentialSecret;
if (token && secret &&
isSafe(token) && isSafe(secret)) {
@@ -187,26 +245,63 @@ OAuth._renderOauthResults = function(res, query, credentialSecret) {
// This "template" (not a real Spacebars template, just an HTML file
// with some ##PLACEHOLDER##s) communicates the credential secret back
// to the main window and then closes the popup.
-OAuth._endOfLoginResponseTemplate = Assets.getText(
- "end_of_login_response.html");
+OAuth._endOfPopupResponseTemplate = Assets.getText(
+ "end_of_popup_response.html");
-// Renders `endOfLoginResponseTemplate` into some HTML and JavaScript
-// that closes the popup at the end of the OAuth flow.
-OAuth._renderEndOfLoginResponse = function (setCredentialToken, token, secret) {
+var endOfRedirectResponseTemplate = Assets.getText(
+ "end_of_redirect_response.html");
+
+// Renders the end of login response template into some HTML and JavaScript
+// that closes the popup or redirects at the end of the OAuth flow.
+//
+// options are:
+// - loginStyle ("popup" or "redirect")
+// - setCredentialToken (boolean)
+// - credentialToken
+// - credentialSecret
+// - redirectUrl
+// - isCordova (boolean)
+//
+var renderEndOfLoginResponse = function (options) {
// It would be nice to use Blaze here, but it's a little tricky
// because our mustaches would be inside a
- Login completed. - Click here to close this window. -
-