Skip to content

Commit

Permalink
Merge branch 'live-docs' into dev-master
Browse files Browse the repository at this point in the history
Conflicts:
	build/yui-nodejs/yui-nodejs-min.js
	build/yui/yui-min.js
  • Loading branch information
Ezequiel Rodriguez committed Feb 25, 2014
2 parents b5bfd32 + 119faf6 commit 271f7fc
Show file tree
Hide file tree
Showing 216 changed files with 5,236 additions and 2,200 deletions.
25 changes: 25 additions & 0 deletions LICENSE.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,9 @@ list of third party contributions to YUI.
[Handlebars.js](https://github.com/wycats/handlebars.js) by Yehuda Katz. It
is distributed with YUI under the terms of the MIT License below.

* **asap.js**: The timers component includes the Asap.js module by Kris Kowal.
It is distributed with YUI under the terms of the MIT License below.


Handlebars.js MIT License
-------------------------
Expand Down Expand Up @@ -118,3 +121,25 @@ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.


Asap.js MIT License
-------------------
Copyright 2009–2013 Contributors. All rights reserved.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to
deal in the Software without restriction, including without limitation the
rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
sell copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
IN THE SOFTWARE.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "yui",
"version": "3.14.2-pre",
"version": "3.15.0",
"devDependencies": {
"pure": "0.3.0"
}
Expand Down
2 changes: 1 addition & 1 deletion build/app-content/app-content-coverage.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions build/app-content/app-content-debug.js
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ AppContent.prototype = {
@param {View} callback.view A reference to the new `activeView`.
@chainable
@since 3.7.0
@see App.showView()
**/
Expand Down
1 change: 1 addition & 0 deletions build/app-content/app-content.js
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ AppContent.prototype = {
@param {View} callback.view A reference to the new `activeView`.
@chainable
@since 3.7.0
@see App.showView()
**/
Expand Down
4 changes: 2 additions & 2 deletions build/async-queue/async-queue-coverage.js

Large diffs are not rendered by default.

8 changes: 7 additions & 1 deletion build/async-queue/async-queue-debug.js
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ Y.extend(Queue, Y.EventTarget, {

if (!callback) {
/**
* Event fired after the last queued callback is executed.
* Event fired when there is no remaining callback in the running queue. Also fired after stop().
* @event complete
*/
this.fire('complete');
Expand Down Expand Up @@ -398,6 +398,12 @@ Y.extend(Queue, Y.EventTarget, {
// currenty running needs to call run() one more time for the 'complete'
// event to be fired.

// if stop is called from outside a callback, we need to explicitely call
// run() once again to fire the 'complete' event.
if (!this._executing) {
this.run();
}

return this;
},

Expand Down
2 changes: 1 addition & 1 deletion build/async-queue/async-queue-min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 7 additions & 1 deletion build/async-queue/async-queue.js
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ Y.extend(Queue, Y.EventTarget, {

if (!callback) {
/**
* Event fired after the last queued callback is executed.
* Event fired when there is no remaining callback in the running queue. Also fired after stop().
* @event complete
*/
this.fire('complete');
Expand Down Expand Up @@ -398,6 +398,12 @@ Y.extend(Queue, Y.EventTarget, {
// currenty running needs to call run() one more time for the 'complete'
// event to be fired.

// if stop is called from outside a callback, we need to explicitely call
// run() once again to fire the 'complete' event.
if (!this._executing) {
this.run();
}

return this;
},

Expand Down

Large diffs are not rendered by default.

Loading

0 comments on commit 271f7fc

Please sign in to comment.