Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
jafl committed Jul 26, 2012
2 parents 1aadb60 + 58c3465 commit dedad6a
Show file tree
Hide file tree
Showing 659 changed files with 34,365 additions and 2,659 deletions.
21 changes: 21 additions & 0 deletions .gitignore
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -82,3 +82,24 @@ build/datatable-base-deprecated/assets/datatable-base-core.css
build/datatable-datasource-deprecated/assets/ build/datatable-datasource-deprecated/assets/
build/datatable-scroll-deprecated/assets/ build/datatable-scroll-deprecated/assets/
build/datatable-sort-deprecated/assets/ build/datatable-sort-deprecated/assets/
build/scrollview-base-ie/assets/
build/scrollview-paginator/assets/
build/scrollview/assets/
build/scrollview-base/assets/scrollview-list-core.css
build/scrollview-base/assets/scrollview-scrollbars-core.css
build/scrollview-base/assets/skins/night/scrollview-list-skin.css
build/scrollview-base/assets/skins/night/scrollview-scrollbars-skin.css
build/scrollview-base/assets/skins/sam/scrollview-list-skin.css
build/scrollview-base/assets/skins/sam/scrollview-scrollbars-skin.css
build/scrollview-list/assets/scrollview-base-core.css
build/scrollview-list/assets/scrollview-scrollbars-core.css
build/scrollview-list/assets/skins/night/scrollview-base-skin.css
build/scrollview-list/assets/skins/night/scrollview-scrollbars-skin.css
build/scrollview-list/assets/skins/sam/scrollview-base-skin.css
build/scrollview-list/assets/skins/sam/scrollview-scrollbars-skin.css
build/scrollview-scrollbars/assets/scrollview-base-core.css
build/scrollview-scrollbars/assets/scrollview-list-core.css
build/scrollview-scrollbars/assets/skins/night/scrollview-base-skin.css
build/scrollview-scrollbars/assets/skins/night/scrollview-list-skin.css
build/scrollview-scrollbars/assets/skins/sam/scrollview-base-skin.css
build/scrollview-scrollbars/assets/skins/sam/scrollview-list-skin.css
2 changes: 1 addition & 1 deletion build/anim-node-plugin/anim-node-plugin-debug.js
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ YUI.add('anim-node-plugin', function(Y) {
* Binds an Anim instance to a Node instance * Binds an Anim instance to a Node instance
* @module anim * @module anim
* @class Plugin.NodeFX * @class Plugin.NodeFX
* @extends Base * @extends Anim
* @submodule anim-node-plugin * @submodule anim-node-plugin
*/ */


Expand Down
2 changes: 1 addition & 1 deletion build/anim-node-plugin/anim-node-plugin.js
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ YUI.add('anim-node-plugin', function(Y) {
* Binds an Anim instance to a Node instance * Binds an Anim instance to a Node instance
* @module anim * @module anim
* @class Plugin.NodeFX * @class Plugin.NodeFX
* @extends Base * @extends Anim
* @submodule anim-node-plugin * @submodule anim-node-plugin
*/ */


Expand Down
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ When this module is used, `Y.App.TransitionsNative` will automatically mix
itself in to `Y.App`. itself in to `Y.App`.
@class App.TransitionsNative @class App.TransitionsNative
@extensionfor App
@since 3.5.0 @since 3.5.0
**/ **/
function AppTransitionsNative() {} function AppTransitionsNative() {}
Expand Down
1 change: 1 addition & 0 deletions build/app-transitions-native/app-transitions-native.js
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ When this module is used, `Y.App.TransitionsNative` will automatically mix
itself in to `Y.App`. itself in to `Y.App`.
@class App.TransitionsNative @class App.TransitionsNative
@extensionfor App
@since 3.5.0 @since 3.5.0
**/ **/
function AppTransitionsNative() {} function AppTransitionsNative() {}
Expand Down
1 change: 1 addition & 0 deletions build/app-transitions/app-transitions-debug.js
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ transition between `activeView` changes using the following effects:
@class App.Transitions @class App.Transitions
@uses App.TransitionsNative @uses App.TransitionsNative
@extensionfor App
@since 3.5.0 @since 3.5.0
**/ **/
function AppTransitions() {} function AppTransitions() {}
Expand Down
1 change: 1 addition & 0 deletions build/app-transitions/app-transitions.js
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ transition between `activeView` changes using the following effects:
@class App.Transitions @class App.Transitions
@uses App.TransitionsNative @uses App.TransitionsNative
@extensionfor App
@since 3.5.0 @since 3.5.0
**/ **/
function AppTransitions() {} function AppTransitions() {}
Expand Down
8 changes: 6 additions & 2 deletions build/autocomplete-list/autocomplete-list-debug.js
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -502,7 +502,11 @@ List = Y.Base.create('autocompleteList', Y.Widget, [
@protected @protected
**/ **/
_syncShim: useShim ? function () { _syncShim: useShim ? function () {
this._boundingBox.shim.sync(); var shim = this._boundingBox.shim;

if (shim) {
shim.sync();
}
} : function () {}, } : function () {},


/** /**
Expand Down Expand Up @@ -887,4 +891,4 @@ for API docs.
Y.AutoComplete = List; Y.AutoComplete = List;




}, '@VERSION@' ,{after:['autocomplete-sources'], lang:['en'], skinnable:true, requires:['autocomplete-base', 'event-resize', 'node-screen', 'selector-css3', 'shim-plugin', 'widget', 'widget-position', 'widget-position-align']}); }, '@VERSION@' ,{lang:['en'], after:['autocomplete-sources'], skinnable:true, requires:['autocomplete-base', 'event-resize', 'node-screen', 'selector-css3', 'shim-plugin', 'widget', 'widget-position', 'widget-position-align']});
4 changes: 2 additions & 2 deletions build/autocomplete-list/autocomplete-list-min.js

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

8 changes: 6 additions & 2 deletions build/autocomplete-list/autocomplete-list.js
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -502,7 +502,11 @@ List = Y.Base.create('autocompleteList', Y.Widget, [
@protected @protected
**/ **/
_syncShim: useShim ? function () { _syncShim: useShim ? function () {
this._boundingBox.shim.sync(); var shim = this._boundingBox.shim;

if (shim) {
shim.sync();
}
} : function () {}, } : function () {},


/** /**
Expand Down Expand Up @@ -887,4 +891,4 @@ for API docs.
Y.AutoComplete = List; Y.AutoComplete = List;




}, '@VERSION@' ,{after:['autocomplete-sources'], lang:['en'], skinnable:true, requires:['autocomplete-base', 'event-resize', 'node-screen', 'selector-css3', 'shim-plugin', 'widget', 'widget-position', 'widget-position-align']}); }, '@VERSION@' ,{lang:['en'], after:['autocomplete-sources'], skinnable:true, requires:['autocomplete-base', 'event-resize', 'node-screen', 'selector-css3', 'shim-plugin', 'widget', 'widget-position', 'widget-position-align']});
Loading

0 comments on commit dedad6a

Please sign in to comment.