Skip to content

Commit

Permalink
Seed Build
Browse files Browse the repository at this point in the history
  • Loading branch information
@davglass
davglass committed Jan 7, 2013
1 parent f60b61c commit 3747671
Show file tree
Hide file tree
Showing 16 changed files with 1,748 additions and 1,988 deletions.
15 changes: 0 additions & 15 deletions build/simpleyui/simpleyui-debug.js
View file
Expand Up @@ -2010,20 +2010,6 @@ relying on ES5 functionality, even when ES5 functionality is available.
**/

/**
<<<<<<< HEAD
Event to wait for before executing the `use()` callback.

The following events are supported:

- available
- contentready
- domready
- load

The event may be specified as a string or as an object hash that provides
additional event configuration, as illustrated in the example below.

=======
* Leverage native JSON stringify if the browser has a native
* implementation. In general, this is a good idea. See the Known Issues
* section in the JSON user guide for caveats. The default value is true
Expand Down Expand Up @@ -2052,7 +2038,6 @@ Delay the `use` callback until a specific event has passed (`load`, `domready`,
@property delayUntil
@type String|Object
@since 3.6.0
>>>>>>> 1b3b9bce26c91c9be5440b38b03d2a95fbf83ba4
@example

You can use `load` or `domready` strings by default:
Expand Down
15 changes: 0 additions & 15 deletions build/simpleyui/simpleyui.js
View file
Expand Up @@ -1671,20 +1671,6 @@ relying on ES5 functionality, even when ES5 functionality is available.
**/

/**
<<<<<<< HEAD
Event to wait for before executing the `use()` callback.

The following events are supported:

- available
- contentready
- domready
- load

The event may be specified as a string or as an object hash that provides
additional event configuration, as illustrated in the example below.

=======
* Leverage native JSON stringify if the browser has a native
* implementation. In general, this is a good idea. See the Known Issues
* section in the JSON user guide for caveats. The default value is true
Expand Down Expand Up @@ -1713,7 +1699,6 @@ Delay the `use` callback until a specific event has passed (`load`, `domready`,
@property delayUntil
@type String|Object
@since 3.6.0
>>>>>>> 1b3b9bce26c91c9be5440b38b03d2a95fbf83ba4
@example

You can use `load` or `domready` strings by default:
Expand Down
889 changes: 437 additions & 452 deletions build/yui-base/yui-base-coverage.js
View file

Large diffs are not rendered by default.

15 changes: 0 additions & 15 deletions build/yui-base/yui-base-debug.js
View file
Expand Up @@ -2010,20 +2010,6 @@ relying on ES5 functionality, even when ES5 functionality is available.
**/

/**
<<<<<<< HEAD
Event to wait for before executing the `use()` callback.
The following events are supported:
- available
- contentready
- domready
- load
The event may be specified as a string or as an object hash that provides
additional event configuration, as illustrated in the example below.
=======
* Leverage native JSON stringify if the browser has a native
* implementation. In general, this is a good idea. See the Known Issues
* section in the JSON user guide for caveats. The default value is true
Expand Down Expand Up @@ -2052,7 +2038,6 @@ Delay the `use` callback until a specific event has passed (`load`, `domready`,
@property delayUntil
@type String|Object
@since 3.6.0
>>>>>>> 1b3b9bce26c91c9be5440b38b03d2a95fbf83ba4
@example
You can use `load` or `domready` strings by default:
Expand Down
15 changes: 0 additions & 15 deletions build/yui-base/yui-base.js
View file
Expand Up @@ -1671,20 +1671,6 @@ relying on ES5 functionality, even when ES5 functionality is available.
**/

/**
<<<<<<< HEAD
Event to wait for before executing the `use()` callback.
The following events are supported:
- available
- contentready
- domready
- load
The event may be specified as a string or as an object hash that provides
additional event configuration, as illustrated in the example below.
=======
* Leverage native JSON stringify if the browser has a native
* implementation. In general, this is a good idea. See the Known Issues
* section in the JSON user guide for caveats. The default value is true
Expand Down Expand Up @@ -1713,7 +1699,6 @@ Delay the `use` callback until a specific event has passed (`load`, `domready`,
@property delayUntil
@type String|Object
@since 3.6.0
>>>>>>> 1b3b9bce26c91c9be5440b38b03d2a95fbf83ba4
@example
You can use `load` or `domready` strings by default:
Expand Down
889 changes: 437 additions & 452 deletions build/yui-core/yui-core-coverage.js
View file

Large diffs are not rendered by default.

15 changes: 0 additions & 15 deletions build/yui-core/yui-core-debug.js
View file
Expand Up @@ -2010,20 +2010,6 @@ relying on ES5 functionality, even when ES5 functionality is available.
**/

/**
<<<<<<< HEAD
Event to wait for before executing the `use()` callback.
The following events are supported:
- available
- contentready
- domready
- load
The event may be specified as a string or as an object hash that provides
additional event configuration, as illustrated in the example below.
=======
* Leverage native JSON stringify if the browser has a native
* implementation. In general, this is a good idea. See the Known Issues
* section in the JSON user guide for caveats. The default value is true
Expand Down Expand Up @@ -2052,7 +2038,6 @@ Delay the `use` callback until a specific event has passed (`load`, `domready`,
@property delayUntil
@type String|Object
@since 3.6.0
>>>>>>> 1b3b9bce26c91c9be5440b38b03d2a95fbf83ba4
@example
You can use `load` or `domready` strings by default:
Expand Down
15 changes: 0 additions & 15 deletions build/yui-core/yui-core.js
View file
Expand Up @@ -1671,20 +1671,6 @@ relying on ES5 functionality, even when ES5 functionality is available.
**/

/**
<<<<<<< HEAD
Event to wait for before executing the `use()` callback.
The following events are supported:
- available
- contentready
- domready
- load
The event may be specified as a string or as an object hash that provides
additional event configuration, as illustrated in the example below.
=======
* Leverage native JSON stringify if the browser has a native
* implementation. In general, this is a good idea. See the Known Issues
* section in the JSON user guide for caveats. The default value is true
Expand Down Expand Up @@ -1713,7 +1699,6 @@ Delay the `use` callback until a specific event has passed (`load`, `domready`,
@property delayUntil
@type String|Object
@since 3.6.0
>>>>>>> 1b3b9bce26c91c9be5440b38b03d2a95fbf83ba4
@example
You can use `load` or `domready` strings by default:
Expand Down
889 changes: 437 additions & 452 deletions build/yui-nodejs/yui-nodejs-coverage.js
View file

Large diffs are not rendered by default.

15 changes: 0 additions & 15 deletions build/yui-nodejs/yui-nodejs-debug.js
View file
Expand Up @@ -2010,20 +2010,6 @@ relying on ES5 functionality, even when ES5 functionality is available.
**/

/**
<<<<<<< HEAD
Event to wait for before executing the `use()` callback.
The following events are supported:
- available
- contentready
- domready
- load
The event may be specified as a string or as an object hash that provides
additional event configuration, as illustrated in the example below.
=======
* Leverage native JSON stringify if the browser has a native
* implementation. In general, this is a good idea. See the Known Issues
* section in the JSON user guide for caveats. The default value is true
Expand Down Expand Up @@ -2052,7 +2038,6 @@ Delay the `use` callback until a specific event has passed (`load`, `domready`,
@property delayUntil
@type String|Object
@since 3.6.0
>>>>>>> 1b3b9bce26c91c9be5440b38b03d2a95fbf83ba4
@example
You can use `load` or `domready` strings by default:
Expand Down
15 changes: 0 additions & 15 deletions build/yui-nodejs/yui-nodejs.js
View file
Expand Up @@ -1671,20 +1671,6 @@ relying on ES5 functionality, even when ES5 functionality is available.
**/

/**
<<<<<<< HEAD
Event to wait for before executing the `use()` callback.
The following events are supported:
- available
- contentready
- domready
- load
The event may be specified as a string or as an object hash that provides
additional event configuration, as illustrated in the example below.
=======
* Leverage native JSON stringify if the browser has a native
* implementation. In general, this is a good idea. See the Known Issues
* section in the JSON user guide for caveats. The default value is true
Expand Down Expand Up @@ -1713,7 +1699,6 @@ Delay the `use` callback until a specific event has passed (`load`, `domready`,
@property delayUntil
@type String|Object
@since 3.6.0
>>>>>>> 1b3b9bce26c91c9be5440b38b03d2a95fbf83ba4
@example
You can use `load` or `domready` strings by default:
Expand Down
889 changes: 437 additions & 452 deletions build/yui/yui-coverage.js
View file

Large diffs are not rendered by default.

15 changes: 0 additions & 15 deletions build/yui/yui-debug.js
View file
Expand Up @@ -2010,20 +2010,6 @@ relying on ES5 functionality, even when ES5 functionality is available.
**/

/**
<<<<<<< HEAD
Event to wait for before executing the `use()` callback.
The following events are supported:
- available
- contentready
- domready
- load
The event may be specified as a string or as an object hash that provides
additional event configuration, as illustrated in the example below.
=======
* Leverage native JSON stringify if the browser has a native
* implementation. In general, this is a good idea. See the Known Issues
* section in the JSON user guide for caveats. The default value is true
Expand Down Expand Up @@ -2052,7 +2038,6 @@ Delay the `use` callback until a specific event has passed (`load`, `domready`,
@property delayUntil
@type String|Object
@since 3.6.0
>>>>>>> 1b3b9bce26c91c9be5440b38b03d2a95fbf83ba4
@example
You can use `load` or `domready` strings by default:
Expand Down
15 changes: 0 additions & 15 deletions build/yui/yui.js
View file
Expand Up @@ -1671,20 +1671,6 @@ relying on ES5 functionality, even when ES5 functionality is available.
**/

/**
<<<<<<< HEAD
Event to wait for before executing the `use()` callback.
The following events are supported:
- available
- contentready
- domready
- load
The event may be specified as a string or as an object hash that provides
additional event configuration, as illustrated in the example below.
=======
* Leverage native JSON stringify if the browser has a native
* implementation. In general, this is a good idea. See the Known Issues
* section in the JSON user guide for caveats. The default value is true
Expand Down Expand Up @@ -1713,7 +1699,6 @@ Delay the `use` callback until a specific event has passed (`load`, `domready`,
@property delayUntil
@type String|Object
@since 3.6.0
>>>>>>> 1b3b9bce26c91c9be5440b38b03d2a95fbf83ba4
@example
You can use `load` or `domready` strings by default:
Expand Down
15 changes: 0 additions & 15 deletions src/simpleyui/js/concat.js
View file
Expand Up @@ -2010,20 +2010,6 @@ relying on ES5 functionality, even when ES5 functionality is available.
**/

/**
<<<<<<< HEAD
Event to wait for before executing the `use()` callback.

The following events are supported:

- available
- contentready
- domready
- load

The event may be specified as a string or as an object hash that provides
additional event configuration, as illustrated in the example below.

=======
* Leverage native JSON stringify if the browser has a native
* implementation. In general, this is a good idea. See the Known Issues
* section in the JSON user guide for caveats. The default value is true
Expand Down Expand Up @@ -2052,7 +2038,6 @@ Delay the `use` callback until a specific event has passed (`load`, `domready`,
@property delayUntil
@type String|Object
@since 3.6.0
>>>>>>> 1b3b9bce26c91c9be5440b38b03d2a95fbf83ba4
@example

You can use `load` or `domready` strings by default:
Expand Down
15 changes: 0 additions & 15 deletions src/yui/js/yui.js
View file
Expand Up @@ -2010,20 +2010,6 @@ relying on ES5 functionality, even when ES5 functionality is available.
**/

/**
<<<<<<< HEAD
Event to wait for before executing the `use()` callback.

The following events are supported:

- available
- contentready
- domready
- load

The event may be specified as a string or as an object hash that provides
additional event configuration, as illustrated in the example below.

=======
* Leverage native JSON stringify if the browser has a native
* implementation. In general, this is a good idea. See the Known Issues
* section in the JSON user guide for caveats. The default value is true
Expand Down Expand Up @@ -2052,7 +2038,6 @@ Delay the `use` callback until a specific event has passed (`load`, `domready`,
@property delayUntil
@type String|Object
@since 3.6.0
>>>>>>> 1b3b9bce26c91c9be5440b38b03d2a95fbf83ba4
@example

You can use `load` or `domready` strings by default:
Expand Down

0 comments on commit 3747671

Please sign in to comment.