Permalink
Browse files

Merge remote-tracking branch 'upstream/master'

  • Loading branch information...
2 parents 1aadb60 + 58c3465 commit dedad6aadb0856b1c7ef3f4df395201262e8b440 @jafl committed Jul 26, 2012
Showing 659 changed files with 34,365 additions and 2,659 deletions.
View
@@ -82,3 +82,24 @@ build/datatable-base-deprecated/assets/datatable-base-core.css
build/datatable-datasource-deprecated/assets/
build/datatable-scroll-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
@@ -4,7 +4,7 @@ YUI.add('anim-node-plugin', function(Y) {
* Binds an Anim instance to a Node instance
* @module anim
* @class Plugin.NodeFX
- * @extends Base
+ * @extends Anim
* @submodule anim-node-plugin
*/
@@ -4,7 +4,7 @@ YUI.add('anim-node-plugin', function(Y) {
* Binds an Anim instance to a Node instance
* @module anim
* @class Plugin.NodeFX
- * @extends Base
+ * @extends Anim
* @submodule anim-node-plugin
*/
@@ -19,6 +19,7 @@ When this module is used, `Y.App.TransitionsNative` will automatically mix
itself in to `Y.App`.
@class App.TransitionsNative
+@extensionfor App
@since 3.5.0
**/
function AppTransitionsNative() {}
@@ -19,6 +19,7 @@ When this module is used, `Y.App.TransitionsNative` will automatically mix
itself in to `Y.App`.
@class App.TransitionsNative
+@extensionfor App
@since 3.5.0
**/
function AppTransitionsNative() {}
@@ -33,6 +33,7 @@ transition between `activeView` changes using the following effects:
@class App.Transitions
@uses App.TransitionsNative
+@extensionfor App
@since 3.5.0
**/
function AppTransitions() {}
@@ -33,6 +33,7 @@ transition between `activeView` changes using the following effects:
@class App.Transitions
@uses App.TransitionsNative
+@extensionfor App
@since 3.5.0
**/
function AppTransitions() {}
@@ -502,7 +502,11 @@ List = Y.Base.create('autocompleteList', Y.Widget, [
@protected
**/
_syncShim: useShim ? function () {
- this._boundingBox.shim.sync();
+ var shim = this._boundingBox.shim;
+
+ if (shim) {
+ shim.sync();
+ }
} : function () {},
/**
@@ -887,4 +891,4 @@ for API docs.
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']});
Oops, something went wrong.
@@ -502,7 +502,11 @@ List = Y.Base.create('autocompleteList', Y.Widget, [
@protected
**/
_syncShim: useShim ? function () {
- this._boundingBox.shim.sync();
+ var shim = this._boundingBox.shim;
+
+ if (shim) {
+ shim.sync();
+ }
} : function () {},
/**
@@ -887,4 +891,4 @@ for API docs.
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']});
Oops, something went wrong.

0 comments on commit dedad6a

Please sign in to comment.