Skip to content

Commit

Permalink
Merge branches 'master' and 'event' into event
Browse files Browse the repository at this point in the history
  • Loading branch information
Anthony Pipkin committed Jul 19, 2012
2 parents 60bf1d7 + d6bc3bb commit 3f08762
Show file tree
Hide file tree
Showing 91 changed files with 2,626 additions and 524 deletions.
2 changes: 1 addition & 1 deletion build/charts-base/charts-base-debug.js
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ Y.ShapeGroup = ShapeGroup;
* Abstract class for creating groups of circles with the same styles and dimensions.
*
* @module graphics
* @class GroupCircle
* @class CircleGroup
* @constructor
*/
CircleGroup = function(cfg)
Expand Down
2 changes: 1 addition & 1 deletion build/charts-base/charts-base.js
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ Y.ShapeGroup = ShapeGroup;
* Abstract class for creating groups of circles with the same styles and dimensions.
*
* @module graphics
* @class GroupCircle
* @class CircleGroup
* @constructor
*/
CircleGroup = function(cfg)
Expand Down
32 changes: 23 additions & 9 deletions build/io-nodejs/io-nodejs-debug.js
Original file line number Diff line number Diff line change
@@ -1,26 +1,48 @@
YUI.add('io-nodejs', function(Y) {

/*global Y: false, Buffer: false, clearInterval: false, clearTimeout: false, console: false, exports: false, global: false, module: false, process: false, querystring: false, require: false, setInterval: false, setTimeout: false, __filename: false, __dirname: false */

/**
* Node.js override for IO, methods are mixed into `Y.IO`
* @module io-nodejs
* @main io-nodejs
*/
/**
* Passthru to the NodeJS <a href="https://github.com/mikeal/request">request</a> module.
* This method is return of `require('request')` so you can use it inside NodeJS without
* the IO abstraction.
* @method request
* @static
* @for IO
*/
if (!Y.IO.request) {
Y.IO.request = require('request');
}

var codes = require('http').STATUS_CODES;

/**
Flatten headers object
@method flatten
@protected
@for IO
@param {Object} o The headers object
@return {String} The flattened headers object
*/
var flatten = function(o) {
var str = [];
Object.keys(o).forEach(function(name) {
str.push(name + ': ' + o[name]);
});
return str.join('\n');
};

Y.log('Loading NodeJS Request Transport', 'info', 'io');

/**
NodeJS IO transport, uses the NodeJS <a href="https://github.com/mikeal/request">request</a>
module under the hood to perform all network IO.
@method transports.nodejs
@for IO
@static
@returns {Object} This object contains only a `send` method that accepts a
`transaction object`, `uri` and the `config object`.
Expand Down Expand Up @@ -60,14 +82,6 @@ YUI.add('io-nodejs', function(Y) {
});
*/

var flatten = function(o) {
var str = [];
Object.keys(o).forEach(function(name) {
str.push(name + ': ' + o[name]);
});
return str.join('\n');
};

Y.IO.transports.nodejs = function() {
return {
send: function (transaction, uri, config) {
Expand Down
32 changes: 23 additions & 9 deletions build/io-nodejs/io-nodejs.js
Original file line number Diff line number Diff line change
@@ -1,25 +1,47 @@
YUI.add('io-nodejs', function(Y) {

/*global Y: false, Buffer: false, clearInterval: false, clearTimeout: false, console: false, exports: false, global: false, module: false, process: false, querystring: false, require: false, setInterval: false, setTimeout: false, __filename: false, __dirname: false */

/**
* Node.js override for IO, methods are mixed into `Y.IO`
* @module io-nodejs
* @main io-nodejs
*/
/**
* Passthru to the NodeJS <a href="https://github.com/mikeal/request">request</a> module.
* This method is return of `require('request')` so you can use it inside NodeJS without
* the IO abstraction.
* @method request
* @static
* @for IO
*/
if (!Y.IO.request) {
Y.IO.request = require('request');
}

var codes = require('http').STATUS_CODES;

/**
Flatten headers object
@method flatten
@protected
@for IO
@param {Object} o The headers object
@return {String} The flattened headers object
*/
var flatten = function(o) {
var str = [];
Object.keys(o).forEach(function(name) {
str.push(name + ': ' + o[name]);
});
return str.join('\n');
};


/**
NodeJS IO transport, uses the NodeJS <a href="https://github.com/mikeal/request">request</a>
module under the hood to perform all network IO.
@method transports.nodejs
@for IO
@static
@returns {Object} This object contains only a `send` method that accepts a
`transaction object`, `uri` and the `config object`.
Expand Down Expand Up @@ -58,14 +80,6 @@ YUI.add('io-nodejs', function(Y) {
});
*/

var flatten = function(o) {
var str = [];
Object.keys(o).forEach(function(name) {
str.push(name + ': ' + o[name]);
});
return str.join('\n');
};

Y.IO.transports.nodejs = function() {
return {
send: function (transaction, uri, config) {
Expand Down
2 changes: 1 addition & 1 deletion build/loader-base/loader-base-debug.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ if (!YUI.Env[Y.version]) {
BUILD = '/build/',
ROOT = VERSION + BUILD,
CDN_BASE = Y.Env.base,
GALLERY_VERSION = 'gallery-2012.07.11-21-38',
GALLERY_VERSION = 'gallery-2012.07.18-13-22',
TNT = '2in3',
TNT_VERSION = '4',
YUI2_VERSION = '2.9.0',
Expand Down
2 changes: 1 addition & 1 deletion build/loader-base/loader-base-min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/loader-base/loader-base.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ if (!YUI.Env[Y.version]) {
BUILD = '/build/',
ROOT = VERSION + BUILD,
CDN_BASE = Y.Env.base,
GALLERY_VERSION = 'gallery-2012.07.11-21-38',
GALLERY_VERSION = 'gallery-2012.07.18-13-22',
TNT = '2in3',
TNT_VERSION = '4',
YUI2_VERSION = '2.9.0',
Expand Down
2 changes: 1 addition & 1 deletion build/loader-yui3/loader-yui3-debug.js
Original file line number Diff line number Diff line change
Expand Up @@ -2457,7 +2457,7 @@ YUI.Env[Y.version].modules = YUI.Env[Y.version].modules || {
]
}
};
YUI.Env[Y.version].md5 = '2631b5fb2c08064b4e8385f1142513e5';
YUI.Env[Y.version].md5 = '5a681478005a2bdc375c61ddfa610d1e';


}, '@VERSION@' ,{requires:['loader-base']});
2 changes: 1 addition & 1 deletion build/loader-yui3/loader-yui3-min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/loader-yui3/loader-yui3.js
Original file line number Diff line number Diff line change
Expand Up @@ -2457,7 +2457,7 @@ YUI.Env[Y.version].modules = YUI.Env[Y.version].modules || {
]
}
};
YUI.Env[Y.version].md5 = '2631b5fb2c08064b4e8385f1142513e5';
YUI.Env[Y.version].md5 = '5a681478005a2bdc375c61ddfa610d1e';


}, '@VERSION@' ,{requires:['loader-base']});
4 changes: 2 additions & 2 deletions build/loader/loader-debug.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ if (!YUI.Env[Y.version]) {
BUILD = '/build/',
ROOT = VERSION + BUILD,
CDN_BASE = Y.Env.base,
GALLERY_VERSION = 'gallery-2012.07.11-21-38',
GALLERY_VERSION = 'gallery-2012.07.18-13-22',
TNT = '2in3',
TNT_VERSION = '4',
YUI2_VERSION = '2.9.0',
Expand Down Expand Up @@ -5304,7 +5304,7 @@ YUI.Env[Y.version].modules = YUI.Env[Y.version].modules || {
]
}
};
YUI.Env[Y.version].md5 = '2631b5fb2c08064b4e8385f1142513e5';
YUI.Env[Y.version].md5 = '5a681478005a2bdc375c61ddfa610d1e';


}, '@VERSION@' ,{requires:['loader-base']});
Expand Down
4 changes: 2 additions & 2 deletions build/loader/loader-min.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions build/loader/loader.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ if (!YUI.Env[Y.version]) {
BUILD = '/build/',
ROOT = VERSION + BUILD,
CDN_BASE = Y.Env.base,
GALLERY_VERSION = 'gallery-2012.07.11-21-38',
GALLERY_VERSION = 'gallery-2012.07.18-13-22',
TNT = '2in3',
TNT_VERSION = '4',
YUI2_VERSION = '2.9.0',
Expand Down Expand Up @@ -5262,7 +5262,7 @@ YUI.Env[Y.version].modules = YUI.Env[Y.version].modules || {
]
}
};
YUI.Env[Y.version].md5 = '2631b5fb2c08064b4e8385f1142513e5';
YUI.Env[Y.version].md5 = '5a681478005a2bdc375c61ddfa610d1e';


}, '@VERSION@' ,{requires:['loader-base']});
Expand Down
39 changes: 20 additions & 19 deletions build/model-sync-rest/model-sync-rest-debug.js
Original file line number Diff line number Diff line change
Expand Up @@ -515,13 +515,14 @@ RESTSync.prototype = {
@method _sendSyncIORequest
@param {Object} config An object with the following properties:
@param {String} action The `sync()` action being performed.
@param {Function} [callback] Called when the sync operation finishes.
@param {String} [entity] The HTTP request entity body.
@param {Object} headers The HTTP request headers.
@param {String} method The HTTP request method.
@param {Number} [timeout] Time until the HTTP request is aborted.
@param {String} url The URL of the HTTP resource.
@param {String} config.action The `sync()` action being performed.
@param {Function} [config.callback] Called when the sync operation
finishes.
@param {String} [config.entity] The HTTP request entity body.
@param {Object} config.headers The HTTP request headers.
@param {String} config.method The HTTP request method.
@param {Number} [config.timeout] Time until the HTTP request is aborted.
@param {String} config.url The URL of the HTTP resource.
@return {Object} The resulting `Y.io()` request object.
@protected
@since 3.6.0
Expand Down Expand Up @@ -597,9 +598,9 @@ RESTSync.prototype = {
@method _onSyncIOEnd
@param {String} txId The `Y.io` transaction id.
@param {Object} details Extra details carried through from `sync()`:
@param {String} action The sync action performed.
@param {Function} [callback] The function to call after syncing.
@param {String} url The URL of the resource the request was made to.
@param {String} details.action The sync action performed.
@param {Function} [details.callback] The function to call after syncing.
@param {String} details.url The URL of the requested resource.
@protected
@since 3.6.0
**/
Expand All @@ -615,9 +616,9 @@ RESTSync.prototype = {
@param {String} txId The `Y.io` transaction id.
@param {Object} res The `Y.io` response object.
@param {Object} details Extra details carried through from `sync()`:
@param {String} action The sync action performed.
@param {Function} [callback] The function to call after syncing.
@param {String} url The URL of the resource the request was made to.
@param {String} details.action The sync action performed.
@param {Function} [details.callback] The function to call after syncing.
@param {String} details.url The URL of the requested resource.
@protected
@since 3.6.0
**/
Expand All @@ -642,9 +643,9 @@ RESTSync.prototype = {
@param {String} txId The `Y.io` transaction id.
@param {Object} res The `Y.io` response object.
@param {Object} details Extra details carried through from `sync()`:
@param {String} action The sync action performed.
@param {Function} [callback] The function to call after syncing.
@param {String} url The URL of the resource the request was made to.
@param {String} details.action The sync action performed.
@param {Function} [details.callback] The function to call after syncing.
@param {String} details.url The URL of the requested resource.
@protected
@since 3.6.0
**/
Expand All @@ -664,9 +665,9 @@ RESTSync.prototype = {
@method _onSyncIOStart
@param {String} txId The `Y.io` transaction id.
@param {Object} details Extra details carried through from `sync()`:
@param {String} action The sync action performed.
@param {Function} [callback] The function to call after syncing.
@param {String} url The URL of the resource the request was made to.
@param {String} detials.action The sync action performed.
@param {Function} [details.callback] The function to call after syncing.
@param {String} details.url The URL of the requested resource.
@protected
@since 3.6.0
**/
Expand Down
39 changes: 20 additions & 19 deletions build/model-sync-rest/model-sync-rest.js
Original file line number Diff line number Diff line change
Expand Up @@ -515,13 +515,14 @@ RESTSync.prototype = {
@method _sendSyncIORequest
@param {Object} config An object with the following properties:
@param {String} action The `sync()` action being performed.
@param {Function} [callback] Called when the sync operation finishes.
@param {String} [entity] The HTTP request entity body.
@param {Object} headers The HTTP request headers.
@param {String} method The HTTP request method.
@param {Number} [timeout] Time until the HTTP request is aborted.
@param {String} url The URL of the HTTP resource.
@param {String} config.action The `sync()` action being performed.
@param {Function} [config.callback] Called when the sync operation
finishes.
@param {String} [config.entity] The HTTP request entity body.
@param {Object} config.headers The HTTP request headers.
@param {String} config.method The HTTP request method.
@param {Number} [config.timeout] Time until the HTTP request is aborted.
@param {String} config.url The URL of the HTTP resource.
@return {Object} The resulting `Y.io()` request object.
@protected
@since 3.6.0
Expand Down Expand Up @@ -597,9 +598,9 @@ RESTSync.prototype = {
@method _onSyncIOEnd
@param {String} txId The `Y.io` transaction id.
@param {Object} details Extra details carried through from `sync()`:
@param {String} action The sync action performed.
@param {Function} [callback] The function to call after syncing.
@param {String} url The URL of the resource the request was made to.
@param {String} details.action The sync action performed.
@param {Function} [details.callback] The function to call after syncing.
@param {String} details.url The URL of the requested resource.
@protected
@since 3.6.0
**/
Expand All @@ -615,9 +616,9 @@ RESTSync.prototype = {
@param {String} txId The `Y.io` transaction id.
@param {Object} res The `Y.io` response object.
@param {Object} details Extra details carried through from `sync()`:
@param {String} action The sync action performed.
@param {Function} [callback] The function to call after syncing.
@param {String} url The URL of the resource the request was made to.
@param {String} details.action The sync action performed.
@param {Function} [details.callback] The function to call after syncing.
@param {String} details.url The URL of the requested resource.
@protected
@since 3.6.0
**/
Expand All @@ -642,9 +643,9 @@ RESTSync.prototype = {
@param {String} txId The `Y.io` transaction id.
@param {Object} res The `Y.io` response object.
@param {Object} details Extra details carried through from `sync()`:
@param {String} action The sync action performed.
@param {Function} [callback] The function to call after syncing.
@param {String} url The URL of the resource the request was made to.
@param {String} details.action The sync action performed.
@param {Function} [details.callback] The function to call after syncing.
@param {String} details.url The URL of the requested resource.
@protected
@since 3.6.0
**/
Expand All @@ -664,9 +665,9 @@ RESTSync.prototype = {
@method _onSyncIOStart
@param {String} txId The `Y.io` transaction id.
@param {Object} details Extra details carried through from `sync()`:
@param {String} action The sync action performed.
@param {Function} [callback] The function to call after syncing.
@param {String} url The URL of the resource the request was made to.
@param {String} detials.action The sync action performed.
@param {Function} [details.callback] The function to call after syncing.
@param {String} details.url The URL of the requested resource.
@protected
@since 3.6.0
**/
Expand Down
Loading

0 comments on commit 3f08762

Please sign in to comment.