Graphic
+ * Shape instances.
+ * @module anim
+ * @submodule anim-shape-transform
+ */
var NUM = Number,
TO,
TOSTRING;
@@ -78,10 +84,7 @@ YUI.add('anim-shape-transform', function(Y) {
}
else if(Y.MatrixUtil.compareTransformSequence(toArray, fromArray))
{
- //toAttr.transform = toArray;
- //anim.set("to", toAttr);
TO = toArray;
- //toAttr.transform = toArray;
from = fromArray;
}
else
@@ -106,4 +109,4 @@ YUI.add('anim-shape-transform', function(Y) {
-}, '3.5.0' ,{requires:['anim-base','matrix']});
+}, '3.5.1' ,{requires:['anim-base','matrix']});
diff --git a/lib/yui/3.5.0/build/anim-shape-transform/anim-shape-transform-min.js b/lib/yui/3.5.1/build/anim-shape-transform/anim-shape-transform-min.js
similarity index 92%
rename from lib/yui/3.5.0/build/anim-shape-transform/anim-shape-transform-min.js
rename to lib/yui/3.5.1/build/anim-shape-transform/anim-shape-transform-min.js
index 0340d0f71e8..db851b01ac3 100644
--- a/lib/yui/3.5.0/build/anim-shape-transform/anim-shape-transform-min.js
+++ b/lib/yui/3.5.1/build/anim-shape-transform/anim-shape-transform-min.js
@@ -1,7 +1,7 @@
/*
-YUI 3.5.0 (build 5089)
+YUI 3.5.1 (build 22)
Copyright 2012 Yahoo! Inc. All rights reserved.
Licensed under the BSD License.
http://yuilibrary.com/license/
*/
-YUI.add("anim-shape-transform",function(d){var b=Number,a,c;d.Anim.behaviors.transform={set:function(k,q,t,u,v,h,s){var g=k._node,f="",r,n,w,e,m=0,l,p,o;u=a;o=a.length;for(;mGraphic
+ * Shape instances.
+ * @module anim
+ * @submodule anim-shape-transform
+ */
var NUM = Number,
TO,
TOSTRING;
@@ -78,10 +84,7 @@ YUI.add('anim-shape-transform', function(Y) {
}
else if(Y.MatrixUtil.compareTransformSequence(toArray, fromArray))
{
- //toAttr.transform = toArray;
- //anim.set("to", toAttr);
TO = toArray;
- //toAttr.transform = toArray;
from = fromArray;
}
else
@@ -106,4 +109,4 @@ YUI.add('anim-shape-transform', function(Y) {
-}, '3.5.0' ,{requires:['anim-base','matrix']});
+}, '3.5.1' ,{requires:['anim-base','matrix']});
diff --git a/lib/yui/3.5.0/build/anim-xy/anim-xy-debug.js b/lib/yui/3.5.1/build/anim-xy/anim-xy-debug.js
similarity index 89%
rename from lib/yui/3.5.0/build/anim-xy/anim-xy-debug.js
rename to lib/yui/3.5.1/build/anim-xy/anim-xy-debug.js
index 6d5e485b479..7be91e5192c 100644
--- a/lib/yui/3.5.0/build/anim-xy/anim-xy-debug.js
+++ b/lib/yui/3.5.1/build/anim-xy/anim-xy-debug.js
@@ -1,5 +1,5 @@
/*
-YUI 3.5.0 (build 5089)
+YUI 3.5.1 (build 22)
Copyright 2012 Yahoo! Inc. All rights reserved.
Licensed under the BSD License.
http://yuilibrary.com/license/
@@ -29,4 +29,4 @@ Y.Anim.behaviors.xy = {
-}, '3.5.0' ,{requires:['anim-base', 'node-screen']});
+}, '3.5.1' ,{requires:['anim-base', 'node-screen']});
diff --git a/lib/yui/3.5.0/build/anim-xy/anim-xy-min.js b/lib/yui/3.5.1/build/anim-xy/anim-xy-min.js
similarity index 78%
rename from lib/yui/3.5.0/build/anim-xy/anim-xy-min.js
rename to lib/yui/3.5.1/build/anim-xy/anim-xy-min.js
index b9f63d730e1..05720f6c06d 100644
--- a/lib/yui/3.5.0/build/anim-xy/anim-xy-min.js
+++ b/lib/yui/3.5.1/build/anim-xy/anim-xy-min.js
@@ -1,7 +1,7 @@
/*
-YUI 3.5.0 (build 5089)
+YUI 3.5.1 (build 22)
Copyright 2012 Yahoo! Inc. All rights reserved.
Licensed under the BSD License.
http://yuilibrary.com/license/
*/
-YUI.add("anim-xy",function(b){var a=Number;b.Anim.behaviors.xy={set:function(f,d,i,h,c,g,e){f._node.setXY([e(c,a(i[0]),a(h[0])-a(i[0]),g),e(c,a(i[1]),a(h[1])-a(i[1]),g)]);},get:function(c){return c._node.getXY();}};},"3.5.0",{requires:["anim-base","node-screen"]});
\ No newline at end of file
+YUI.add("anim-xy",function(b){var a=Number;b.Anim.behaviors.xy={set:function(f,d,i,h,c,g,e){f._node.setXY([e(c,a(i[0]),a(h[0])-a(i[0]),g),e(c,a(i[1]),a(h[1])-a(i[1]),g)]);},get:function(c){return c._node.getXY();}};},"3.5.1",{requires:["anim-base","node-screen"]});
\ No newline at end of file
diff --git a/lib/yui/3.5.0/build/anim-xy/anim-xy.js b/lib/yui/3.5.1/build/anim-xy/anim-xy.js
similarity index 89%
rename from lib/yui/3.5.0/build/anim-xy/anim-xy.js
rename to lib/yui/3.5.1/build/anim-xy/anim-xy.js
index 6d5e485b479..7be91e5192c 100644
--- a/lib/yui/3.5.0/build/anim-xy/anim-xy.js
+++ b/lib/yui/3.5.1/build/anim-xy/anim-xy.js
@@ -1,5 +1,5 @@
/*
-YUI 3.5.0 (build 5089)
+YUI 3.5.1 (build 22)
Copyright 2012 Yahoo! Inc. All rights reserved.
Licensed under the BSD License.
http://yuilibrary.com/license/
@@ -29,4 +29,4 @@ Y.Anim.behaviors.xy = {
-}, '3.5.0' ,{requires:['anim-base', 'node-screen']});
+}, '3.5.1' ,{requires:['anim-base', 'node-screen']});
diff --git a/lib/yui/3.5.0/build/app-base/app-base-debug.js b/lib/yui/3.5.1/build/app-base/app-base-debug.js
similarity index 90%
rename from lib/yui/3.5.0/build/app-base/app-base-debug.js
rename to lib/yui/3.5.1/build/app-base/app-base-debug.js
index 65f07ae023d..155de9f865f 100644
--- a/lib/yui/3.5.0/build/app-base/app-base-debug.js
+++ b/lib/yui/3.5.1/build/app-base/app-base-debug.js
@@ -1,5 +1,5 @@
/*
-YUI 3.5.0 (build 5089)
+YUI 3.5.1 (build 22)
Copyright 2012 Yahoo! Inc. All rights reserved.
Licensed under the BSD License.
http://yuilibrary.com/license/
@@ -25,6 +25,9 @@ Provides a top-level application component which manages navigation and views.
// TODO: Better handling of lifecycle for registered views:
//
+// * [!] Just redo basically everything with view management so there are no
+// pre-`activeViewChange` side effects and handle the rest of these things:
+//
// * Seems like any view created via `createView` should listen for the view's
// `destroy` event and use that to remove it from the `_viewsInfoMap`. I
// should look at what ModelList does for Models as a reference.
@@ -34,6 +37,9 @@ Provides a top-level application component which manages navigation and views.
// above? We could do `app.getView('foo').destroy()` and it would be removed
// from the `_viewsInfoMap` as well.
//
+// * Should we wait to call a view's `render()` method inside of the
+// `_attachView()` method?
+//
// * Should named views support a collection of instances instead of just one?
//
@@ -309,6 +315,10 @@ App = Y.Base.create('app', Y.Base, [View, Router, PjaxBase], {
Sets which view is active/visible for the application. This will set the
app's `activeView` attribute to the specified `view`.
+ The `view` will be "attached" to this app, meaning it will be both rendered
+ into this app's `viewContainer` node and all of its events will bubble to
+ the app. The previous `activeView` will be "detached" from this app.
+
When a string-name is provided for a view which has been registered on this
app's `views` object, the referenced metadata will be used and the
`activeView` will be set to either a preserved view instance, or a new
@@ -322,15 +332,17 @@ App = Y.Base.create('app', Y.Base, [View, Router, PjaxBase], {
@example
var app = new Y.App({
views: {
- users: {
+ usersView: {
// Imagine that `Y.UsersView` has been defined.
type: Y.UsersView
}
- }
+ },
+
+ users: new Y.ModelList()
});
app.route('/users/', function () {
- this.showView('users');
+ this.showView('usersView', {users: this.get('users')});
});
app.render();
@@ -338,26 +350,44 @@ App = Y.Base.create('app', Y.Base, [View, Router, PjaxBase], {
@method showView
@param {String|View} view The name of a view defined in the `views` object,
- or a view instance.
+ or a view instance which should become this app's `activeView`.
@param {Object} [config] Optional configuration to use when creating a new
- view instance.
+ view instance. This config object can also be used to update an existing
+ or preserved view's attributes when `options.update` is `true`.
@param {Object} [options] Optional object containing any of the following
properties:
@param {Function} [options.callback] Optional callback function to call
after new `activeView` is ready to use, the function will be passed:
@param {View} options.callback.view A reference to the new
`activeView`.
- @param {Boolean} [options.prepend] Whether the new view should be
+ @param {Boolean} [options.prepend=false] Whether the `view` should be
prepended instead of appended to the `viewContainer`.
+ @param {Boolean} [options.render] Whether the `view` should be rendered.
+ **Note:** If no value is specified, a view instance will only be
+ rendered if it's newly created by this method.
+ @param {Boolean} [options.update=false] Whether an existing view should
+ have its attributes updated by passing the `config` object to its
+ `setAttrs()` method. **Note:** This option does not have an effect if
+ the `view` instance is created as a result of calling this method.
@param {Function} [callback] Optional callback Function to call after the
new `activeView` is ready to use. **Note:** this will override
- `options.callback`. The function will be passed the following:
+ `options.callback` and it can be specified as either the third or fourth
+ argument. The function will be passed the following:
@param {View} callback.view A reference to the new `activeView`.
@chainable
@since 3.5.0
**/
showView: function (view, config, options, callback) {
- var viewInfo;
+ var viewInfo, created;
+
+ options || (options = {});
+
+ // Support the callback function being either the third or fourth arg.
+ if (callback) {
+ options.callback = callback;
+ } else if (Lang.isFunction(options)) {
+ options = {callback: options};
+ }
if (Lang.isString(view)) {
viewInfo = this.getViewInfo(view);
@@ -368,32 +398,38 @@ App = Y.Base.create('app', Y.Base, [View, Router, PjaxBase], {
// `preserve` when detaching?
if (viewInfo && viewInfo.preserve && viewInfo.instance) {
view = viewInfo.instance;
+
// Make sure there's a mapping back to the view metadata.
this._viewInfoMap[Y.stamp(view, true)] = viewInfo;
} else {
- view = this.createView(view, config);
- view.render();
+ // TODO: Add the app as a bubble target during construction, but
+ // make sure to check that it isn't already in `bubbleTargets`!
+ // This will allow the app to be notified for about _all_ of the
+ // view's events. **Note:** This should _only_ happen if the
+ // view is created _after_ `activeViewChange`.
+
+ view = this.createView(view, config);
+ created = true;
}
}
- // TODO: Add `options.update` to update to view with the `config`, if
- // needed. This could also call `setAttrs()` when the specified `view`
- // already a View instance. Is this be too much overloading of the API?
-
- // TODO: Add `options.render` to provide a way to control whether a view
- // is rendered or not; by default, `render()` will only be called if
- // this method created the View.
-
- options || (options = {});
-
- if (callback) {
- options.callback = callback;
- } else if (Lang.isFunction(options)) {
- options = {callback: options};
+ // Update the specified or preserved `view` when signaled to do so.
+ // There's no need to updated a view if it was _just_ created.
+ if (options.update && !created) {
+ view.setAttrs(config);
}
- // TODO: Should the `callback` _always_ be called, even when the
- // `activeView` does not change?
+ // TODO: Hold off on rendering the view until after it has been
+ // "attached", and move the call to render into `_attachView()`.
+
+ // When a value is specified for `options.render`, prefer it because it
+ // represents the developer's intent. When no value is specified, the
+ // `view` will only be rendered if it was just created.
+ if ('render' in options) {
+ options.render && view.render();
+ } else if (created) {
+ view.render();
+ }
return this._set('activeView', view, {options: options});
},
@@ -407,8 +443,8 @@ App = Y.Base.create('app', Y.Base, [View, Router, PjaxBase], {
@method _attachView
@param {View} view View to attach.
- @param {Boolean} prepend Whether the view should be prepended instead of
- appended to the `viewContainer`.
+ @param {Boolean} prepend=false Whether the view should be prepended instead
+ of appended to the `viewContainer`.
@protected
@since 3.5.0
**/
@@ -426,6 +462,9 @@ App = Y.Base.create('app', Y.Base, [View, Router, PjaxBase], {
// TODO: Attach events here for persevered Views?
// See related TODO in `_detachView`.
+ // TODO: Actually render the view here so that it gets "attached" before
+ // it gets rendered?
+
// Insert view into the DOM.
viewContainer[prepend ? 'prepend' : 'append'](view.get('container'));
},
@@ -652,7 +691,7 @@ App = Y.Base.create('app', Y.Base, [View, Router, PjaxBase], {
// Force navigation to be enhanced and handled by the app when
// `serverRouting` is falsy because the server might not be able to
// properly handle the request.
- Lang.isValue(options.force) || (options.force = true);
+ 'force' in options || (options.force = true);
}
return PjaxBase.prototype._navigate.call(this, url, options);
@@ -731,8 +770,15 @@ App = Y.Base.create('app', Y.Base, [View, Router, PjaxBase], {
after new `activeView` is ready to use, the function will be passed:
@param {View} options.callback.view A reference to the new
`activeView`.
- @param {Boolean} [options.prepend] Whether the new view should be
+ @param {Boolean} [options.prepend=false] Whether the `view` should be
prepended instead of appended to the `viewContainer`.
+ @param {Boolean} [options.render] Whether the `view` should be rendered.
+ **Note:** If no value is specified, a view instance will only be
+ rendered if it's newly created by this method.
+ @param {Boolean} [options.update=false] Whether an existing view should
+ have its attributes updated by passing the `config` object to its
+ `setAttrs()` method. **Note:** This option does not have an effect if
+ the `view` instance is created as a result of calling this method.
@protected
@since 3.5.0
**/
@@ -827,7 +873,7 @@ App = Y.Base.create('app', Y.Base, [View, Router, PjaxBase], {
@type View
@default null
@readOnly
- @see AppBase.showView()
+ @see App.Base.showView()
@since 3.5.0
**/
activeView: {
@@ -1093,4 +1139,4 @@ instance will be **auto-mixed** on to the `Y.App` class. Consider this example:
Y.App = Y.mix(Y.Base.create('app', Y.App.Base, []), Y.App, true);
-}, '3.5.0' ,{requires:['classnamemanager', 'pjax-base', 'router', 'view']});
+}, '3.5.1' ,{requires:['classnamemanager', 'pjax-base', 'router', 'view']});
diff --git a/lib/yui/3.5.1/build/app-base/app-base-min.js b/lib/yui/3.5.1/build/app-base/app-base-min.js
new file mode 100644
index 00000000000..82ffd8c1693
--- /dev/null
+++ b/lib/yui/3.5.1/build/app-base/app-base-min.js
@@ -0,0 +1,7 @@
+/*
+YUI 3.5.1 (build 22)
+Copyright 2012 Yahoo! Inc. All rights reserved.
+Licensed under the BSD License.
+http://yuilibrary.com/license/
+*/
+YUI.add("app-base",function(c){var g=c.Lang,i=c.Object,a=c.PjaxBase,d=c.Router,b=c.View,e=c.ClassNameManager.getClassName,h=c.config.win,f;f=c.Base.create("app",c.Base,[b,d,a],{views:{},initializer:function(k){k||(k={});var j={};function l(m,n){j[n]=c.merge(j[n],m);}i.each(this.views,l);i.each(k.views,l);this.views=j;this._viewInfoMap={};this.after("activeViewChange",c.bind("_afterActiveViewChange",this));if(!this.get("serverRouting")){this._pjaxBindUI();}},createView:function(m,l){var k=this.getViewInfo(m),n=(k&&k.type)||b,o,j;o=g.isString(n)?i.getValue(c,n.split(".")):n;j=new o(l);this._viewInfoMap[c.stamp(j,true)]=k;return j;},getViewInfo:function(j){if(g.isString(j)){return this.views[j];}return j&&this._viewInfoMap[c.stamp(j,true)];},render:function(){var k=this.get("container"),j=this.get("viewContainer"),l=this.get("activeView"),n=l&&l.get("container"),m=k.compareTo(j);k.addClass(f.CSS_CLASS);j.addClass(f.VIEWS_CSS_CLASS);if(l&&!j.contains(n)){j.appendChild(n);}if(!k.contains(j)&&!m){k.appendChild(j);}return this;},showView:function(j,m,l,o){var k,n;l||(l={});if(o){l.callback=o;}else{if(g.isFunction(l)){l={callback:l};}}if(g.isString(j)){k=this.getViewInfo(j);if(k&&k.preserve&&k.instance){j=k.instance;this._viewInfoMap[c.stamp(j,true)]=k;}else{j=this.createView(j,m);n=true;}}if(l.update&&!n){j.setAttrs(m);}if("render" in l){l.render&&j.render();}else{if(n){j.render();}}return this._set("activeView",j,{options:l});},_attachView:function(k,l){if(!k){return;}var m=this.getViewInfo(k),j=this.get("viewContainer");k.addTarget(this);m&&(m.instance=k);j[l?"prepend":"append"](k.get("container"));},_destroyContainer:function(){var k=this.get("container"),j=this.get("viewContainer"),l=k.compareTo(j);if(c.one("body").compareTo(k)){this.detachEvents();k&&k.removeClass(f.CSS_CLASS);if(l){k&&k.removeClass(f.VIEWS_CSS_CLASS);}else{j&&j.remove(true);}return;}j&&j.remove(true);!l&&k&&k.remove(true);},_detachView:function(j){if(!j){return;}var k=this.getViewInfo(j)||{};if(k.preserve){j.remove();}else{j.destroy({remove:true});delete this._viewInfoMap[c.stamp(j,true)];if(j===k.instance){delete k.instance;}}j.removeTarget(this);},_getViewContainer:function(j){if(!j&&!this._viewContainer){j=this._viewContainer=this.create();this._set("viewContainer",j);}return j;},_getURL:function(){var j=c.getLocation().toString();return this._html5?j:this._upgradeURL(j);},_initHtml5:function(){if(this.get("serverRouting")===false){return false;}else{return d.html5;}},_isChildView:function(j,m){var l=this.getViewInfo(j),k=this.getViewInfo(m);if(l&&k){return this.getViewInfo(l.parent)===k;}return false;},_isParentView:function(j,m){var k=this.getViewInfo(j),l=this.getViewInfo(m);if(k&&l){return this.getViewInfo(l.parent)===k;}return false;},_navigate:function(k,j){k=this._upgradeURL(k);j||(j={});if(!this.get("serverRouting")){"force" in j||(j.force=true);}return a.prototype._navigate.call(this,k,j);},_save:function(j,k){if(this.get("serverRouting")&&!this.get("html5")){if(!this._hasSameOrigin(j)){c.error("Security error: The new URL must be of the same origin as the current URL.");return this;}j=this._joinURL(j||"");if(k){h&&h.location.replace(j);}else{h&&(h.location=j);}return this;}return d.prototype._save.apply(this,arguments);},_uiSetActiveView:function(p,n,m){m||(m={});var o=m.callback,j=this._isChildView(p,n),l=!j&&this._isParentView(p,n),k=!!m.prepend||l;if(p===n){return o&&o.call(this,p);}this._attachView(p,k);this._detachView(n);o&&o.call(this,p);},_upgradeURL:function(k){if(!this._hasSameOrigin(k)){return k;}var l=(k.match(/#(.*)$/)||[])[1]||"",j=c.HistoryHash.hashPrefix;if(j&&l.indexOf(j)===0){l=l.replace(j,"");}if(l&&l.charAt(0)==="/"){k=this._resolveURL(this._joinURL(l));}return k;},_afterActiveViewChange:function(j){this._uiSetActiveView(j.newVal,j.prevVal,j.options);}},{ATTRS:{activeView:{value:null,readOnly:true},container:{valueFn:function(){return c.one("body");}},html5:{valueFn:"_initHtml5"},linkSelector:{value:"a"},serverRouting:{value:undefined,writeOnce:"initOnly"},viewContainer:{getter:"_getViewContainer",setter:c.one,writeOnce:true}},CSS_CLASS:e("app"),VIEWS_CSS_CLASS:e("app","views"),_NON_ATTRS_CFG:["views"]});c.namespace("App").Base=f;c.App=c.mix(c.Base.create("app",c.App.Base,[]),c.App,true);},"3.5.1",{requires:["classnamemanager","pjax-base","router","view"]});
\ No newline at end of file
diff --git a/lib/yui/3.5.0/build/app-base/app-base.js b/lib/yui/3.5.1/build/app-base/app-base.js
similarity index 90%
rename from lib/yui/3.5.0/build/app-base/app-base.js
rename to lib/yui/3.5.1/build/app-base/app-base.js
index 65f07ae023d..155de9f865f 100644
--- a/lib/yui/3.5.0/build/app-base/app-base.js
+++ b/lib/yui/3.5.1/build/app-base/app-base.js
@@ -1,5 +1,5 @@
/*
-YUI 3.5.0 (build 5089)
+YUI 3.5.1 (build 22)
Copyright 2012 Yahoo! Inc. All rights reserved.
Licensed under the BSD License.
http://yuilibrary.com/license/
@@ -25,6 +25,9 @@ Provides a top-level application component which manages navigation and views.
// TODO: Better handling of lifecycle for registered views:
//
+// * [!] Just redo basically everything with view management so there are no
+// pre-`activeViewChange` side effects and handle the rest of these things:
+//
// * Seems like any view created via `createView` should listen for the view's
// `destroy` event and use that to remove it from the `_viewsInfoMap`. I
// should look at what ModelList does for Models as a reference.
@@ -34,6 +37,9 @@ Provides a top-level application component which manages navigation and views.
// above? We could do `app.getView('foo').destroy()` and it would be removed
// from the `_viewsInfoMap` as well.
//
+// * Should we wait to call a view's `render()` method inside of the
+// `_attachView()` method?
+//
// * Should named views support a collection of instances instead of just one?
//
@@ -309,6 +315,10 @@ App = Y.Base.create('app', Y.Base, [View, Router, PjaxBase], {
Sets which view is active/visible for the application. This will set the
app's `activeView` attribute to the specified `view`.
+ The `view` will be "attached" to this app, meaning it will be both rendered
+ into this app's `viewContainer` node and all of its events will bubble to
+ the app. The previous `activeView` will be "detached" from this app.
+
When a string-name is provided for a view which has been registered on this
app's `views` object, the referenced metadata will be used and the
`activeView` will be set to either a preserved view instance, or a new
@@ -322,15 +332,17 @@ App = Y.Base.create('app', Y.Base, [View, Router, PjaxBase], {
@example
var app = new Y.App({
views: {
- users: {
+ usersView: {
// Imagine that `Y.UsersView` has been defined.
type: Y.UsersView
}
- }
+ },
+
+ users: new Y.ModelList()
});
app.route('/users/', function () {
- this.showView('users');
+ this.showView('usersView', {users: this.get('users')});
});
app.render();
@@ -338,26 +350,44 @@ App = Y.Base.create('app', Y.Base, [View, Router, PjaxBase], {
@method showView
@param {String|View} view The name of a view defined in the `views` object,
- or a view instance.
+ or a view instance which should become this app's `activeView`.
@param {Object} [config] Optional configuration to use when creating a new
- view instance.
+ view instance. This config object can also be used to update an existing
+ or preserved view's attributes when `options.update` is `true`.
@param {Object} [options] Optional object containing any of the following
properties:
@param {Function} [options.callback] Optional callback function to call
after new `activeView` is ready to use, the function will be passed:
@param {View} options.callback.view A reference to the new
`activeView`.
- @param {Boolean} [options.prepend] Whether the new view should be
+ @param {Boolean} [options.prepend=false] Whether the `view` should be
prepended instead of appended to the `viewContainer`.
+ @param {Boolean} [options.render] Whether the `view` should be rendered.
+ **Note:** If no value is specified, a view instance will only be
+ rendered if it's newly created by this method.
+ @param {Boolean} [options.update=false] Whether an existing view should
+ have its attributes updated by passing the `config` object to its
+ `setAttrs()` method. **Note:** This option does not have an effect if
+ the `view` instance is created as a result of calling this method.
@param {Function} [callback] Optional callback Function to call after the
new `activeView` is ready to use. **Note:** this will override
- `options.callback`. The function will be passed the following:
+ `options.callback` and it can be specified as either the third or fourth
+ argument. The function will be passed the following:
@param {View} callback.view A reference to the new `activeView`.
@chainable
@since 3.5.0
**/
showView: function (view, config, options, callback) {
- var viewInfo;
+ var viewInfo, created;
+
+ options || (options = {});
+
+ // Support the callback function being either the third or fourth arg.
+ if (callback) {
+ options.callback = callback;
+ } else if (Lang.isFunction(options)) {
+ options = {callback: options};
+ }
if (Lang.isString(view)) {
viewInfo = this.getViewInfo(view);
@@ -368,32 +398,38 @@ App = Y.Base.create('app', Y.Base, [View, Router, PjaxBase], {
// `preserve` when detaching?
if (viewInfo && viewInfo.preserve && viewInfo.instance) {
view = viewInfo.instance;
+
// Make sure there's a mapping back to the view metadata.
this._viewInfoMap[Y.stamp(view, true)] = viewInfo;
} else {
- view = this.createView(view, config);
- view.render();
+ // TODO: Add the app as a bubble target during construction, but
+ // make sure to check that it isn't already in `bubbleTargets`!
+ // This will allow the app to be notified for about _all_ of the
+ // view's events. **Note:** This should _only_ happen if the
+ // view is created _after_ `activeViewChange`.
+
+ view = this.createView(view, config);
+ created = true;
}
}
- // TODO: Add `options.update` to update to view with the `config`, if
- // needed. This could also call `setAttrs()` when the specified `view`
- // already a View instance. Is this be too much overloading of the API?
-
- // TODO: Add `options.render` to provide a way to control whether a view
- // is rendered or not; by default, `render()` will only be called if
- // this method created the View.
-
- options || (options = {});
-
- if (callback) {
- options.callback = callback;
- } else if (Lang.isFunction(options)) {
- options = {callback: options};
+ // Update the specified or preserved `view` when signaled to do so.
+ // There's no need to updated a view if it was _just_ created.
+ if (options.update && !created) {
+ view.setAttrs(config);
}
- // TODO: Should the `callback` _always_ be called, even when the
- // `activeView` does not change?
+ // TODO: Hold off on rendering the view until after it has been
+ // "attached", and move the call to render into `_attachView()`.
+
+ // When a value is specified for `options.render`, prefer it because it
+ // represents the developer's intent. When no value is specified, the
+ // `view` will only be rendered if it was just created.
+ if ('render' in options) {
+ options.render && view.render();
+ } else if (created) {
+ view.render();
+ }
return this._set('activeView', view, {options: options});
},
@@ -407,8 +443,8 @@ App = Y.Base.create('app', Y.Base, [View, Router, PjaxBase], {
@method _attachView
@param {View} view View to attach.
- @param {Boolean} prepend Whether the view should be prepended instead of
- appended to the `viewContainer`.
+ @param {Boolean} prepend=false Whether the view should be prepended instead
+ of appended to the `viewContainer`.
@protected
@since 3.5.0
**/
@@ -426,6 +462,9 @@ App = Y.Base.create('app', Y.Base, [View, Router, PjaxBase], {
// TODO: Attach events here for persevered Views?
// See related TODO in `_detachView`.
+ // TODO: Actually render the view here so that it gets "attached" before
+ // it gets rendered?
+
// Insert view into the DOM.
viewContainer[prepend ? 'prepend' : 'append'](view.get('container'));
},
@@ -652,7 +691,7 @@ App = Y.Base.create('app', Y.Base, [View, Router, PjaxBase], {
// Force navigation to be enhanced and handled by the app when
// `serverRouting` is falsy because the server might not be able to
// properly handle the request.
- Lang.isValue(options.force) || (options.force = true);
+ 'force' in options || (options.force = true);
}
return PjaxBase.prototype._navigate.call(this, url, options);
@@ -731,8 +770,15 @@ App = Y.Base.create('app', Y.Base, [View, Router, PjaxBase], {
after new `activeView` is ready to use, the function will be passed:
@param {View} options.callback.view A reference to the new
`activeView`.
- @param {Boolean} [options.prepend] Whether the new view should be
+ @param {Boolean} [options.prepend=false] Whether the `view` should be
prepended instead of appended to the `viewContainer`.
+ @param {Boolean} [options.render] Whether the `view` should be rendered.
+ **Note:** If no value is specified, a view instance will only be
+ rendered if it's newly created by this method.
+ @param {Boolean} [options.update=false] Whether an existing view should
+ have its attributes updated by passing the `config` object to its
+ `setAttrs()` method. **Note:** This option does not have an effect if
+ the `view` instance is created as a result of calling this method.
@protected
@since 3.5.0
**/
@@ -827,7 +873,7 @@ App = Y.Base.create('app', Y.Base, [View, Router, PjaxBase], {
@type View
@default null
@readOnly
- @see AppBase.showView()
+ @see App.Base.showView()
@since 3.5.0
**/
activeView: {
@@ -1093,4 +1139,4 @@ instance will be **auto-mixed** on to the `Y.App` class. Consider this example:
Y.App = Y.mix(Y.Base.create('app', Y.App.Base, []), Y.App, true);
-}, '3.5.0' ,{requires:['classnamemanager', 'pjax-base', 'router', 'view']});
+}, '3.5.1' ,{requires:['classnamemanager', 'pjax-base', 'router', 'view']});
diff --git a/lib/yui/3.5.0/build/app-transitions-css/app-transitions-css-min.css b/lib/yui/3.5.1/build/app-transitions-css/app-transitions-css-min.css
similarity index 95%
rename from lib/yui/3.5.0/build/app-transitions-css/app-transitions-css-min.css
rename to lib/yui/3.5.1/build/app-transitions-css/app-transitions-css-min.css
index d6b06d65203..efdbd2f4be1 100644
--- a/lib/yui/3.5.0/build/app-transitions-css/app-transitions-css-min.css
+++ b/lib/yui/3.5.1/build/app-transitions-css/app-transitions-css-min.css
@@ -1,5 +1,5 @@
/*
-YUI 3.5.0 (build 5089)
+YUI 3.5.1 (build 22)
Copyright 2012 Yahoo! Inc. All rights reserved.
Licensed under the BSD License.
http://yuilibrary.com/license/
diff --git a/lib/yui/3.5.0/build/app-transitions-css/app-transitions-css.css b/lib/yui/3.5.1/build/app-transitions-css/app-transitions-css.css
similarity index 96%
rename from lib/yui/3.5.0/build/app-transitions-css/app-transitions-css.css
rename to lib/yui/3.5.1/build/app-transitions-css/app-transitions-css.css
index e959d49d2e7..e080c65bc43 100644
--- a/lib/yui/3.5.0/build/app-transitions-css/app-transitions-css.css
+++ b/lib/yui/3.5.1/build/app-transitions-css/app-transitions-css.css
@@ -1,5 +1,5 @@
/*
-YUI 3.5.0 (build 5089)
+YUI 3.5.1 (build 22)
Copyright 2012 Yahoo! Inc. All rights reserved.
Licensed under the BSD License.
http://yuilibrary.com/license/
diff --git a/lib/yui/3.5.0/build/app-transitions-native/app-transitions-native-debug.js b/lib/yui/3.5.1/build/app-transitions-native/app-transitions-native-debug.js
similarity index 93%
rename from lib/yui/3.5.0/build/app-transitions-native/app-transitions-native-debug.js
rename to lib/yui/3.5.1/build/app-transitions-native/app-transitions-native-debug.js
index 6eb544884ad..7ee82c60b40 100644
--- a/lib/yui/3.5.0/build/app-transitions-native/app-transitions-native-debug.js
+++ b/lib/yui/3.5.1/build/app-transitions-native/app-transitions-native-debug.js
@@ -1,5 +1,5 @@
/*
-YUI 3.5.0 (build 5089)
+YUI 3.5.1 (build 22)
Copyright 2012 Yahoo! Inc. All rights reserved.
Licensed under the BSD License.
http://yuilibrary.com/license/
@@ -179,11 +179,18 @@ AppTransitionsNative.prototype = {
after new `activeView` is ready to use, the function will be passed:
@param {View} options.callback.view A reference to the new
`activeView`.
- @param {Boolean} [options.prepend] Whether the new view should be
+ @param {Boolean} [options.prepend=false] Whether the `view` should be
prepended instead of appended to the `viewContainer`.
+ @param {Boolean} [options.render] Whether the `view` should be rendered.
+ **Note:** If no value is specified, a view instance will only be
+ rendered if it's newly created by this method.
@param {Boolean|String} [options.transition] Optional transition override.
A transition can be specified which will override the default, or
`false` for no transition.
+ @param {Boolean} [options.update=false] Whether an existing view should
+ have its attributes updated by passing the `config` object to its
+ `setAttrs()` method. **Note:** This option does not have an effect if
+ the `view` instance is created as a result of calling this method.
@protected
@since 3.5.0
**/
@@ -348,4 +355,4 @@ Y.App.TransitionsNative = AppTransitionsNative;
Y.Base.mix(Y.App, [AppTransitionsNative]);
-}, '3.5.0' ,{requires:['app-transitions', 'app-transitions-css', 'parallel', 'transition']});
+}, '3.5.1' ,{requires:['app-transitions', 'app-transitions-css', 'parallel', 'transition']});
diff --git a/lib/yui/3.5.0/build/app-transitions-native/app-transitions-native-min.js b/lib/yui/3.5.1/build/app-transitions-native/app-transitions-native-min.js
similarity index 96%
rename from lib/yui/3.5.0/build/app-transitions-native/app-transitions-native-min.js
rename to lib/yui/3.5.1/build/app-transitions-native/app-transitions-native-min.js
index 02ce06723ff..e36154fc893 100644
--- a/lib/yui/3.5.0/build/app-transitions-native/app-transitions-native-min.js
+++ b/lib/yui/3.5.1/build/app-transitions-native/app-transitions-native-min.js
@@ -1,7 +1,7 @@
/*
-YUI 3.5.0 (build 5089)
+YUI 3.5.1 (build 22)
Copyright 2012 Yahoo! Inc. All rights reserved.
Licensed under the BSD License.
http://yuilibrary.com/license/
*/
-YUI.add("app-transitions-native",function(c){var a=c.App.Transitions;function b(){}b.prototype={initializer:function(){this._transitioning=false;this._viewTransitionQueue=[];c.Do.before(this._queueActiveView,this,"_uiSetActiveView");},_dequeueActiveView:function(){var d=this._viewTransitionQueue,f=d.shift(),e;if(f){if(d.length){e=c.merge(f[2],{transition:false});f.splice(2,1,e);}this._uiTransitionActiveView.apply(this,f);}},_getFx:function(h,d,g){var e=a.FX,f=this.get("transitions");if(g===false||!f){return null;}if(g){return e[g];}if(this._isChildView(h,d)){return e[f.toChild];}if(this._isParentView(h,d)){return e[f.toParent];}return e[f.navigate];},_queueActiveView:function(){var d=c.Array(arguments,0,true);this._viewTransitionQueue.push(d);if(!this._transitioning){this._dequeueActiveView();}return new c.Do.Prevent();},_uiTransitionActiveView:function(i,l,p){p||(p={});var n=p.callback,d,m,e,j,o,h,g,k;if(i===l){n&&n.call(this,i);this._transitioning=false;return this._dequeueActiveView();}h=this._getFx(i,l,p.transition);e=this._isChildView(i,l);j=!e&&this._isParentView(i,l);o=!!p.prepend||j;if(!h){this._attachView(i,o);this._detachView(l);n&&n.call(this,i);this._transitioning=false;return this._dequeueActiveView();}this._transitioning=true;d=this.get("container");m=a.CLASS_NAMES.transitioning;d.addClass(m);this._attachView(i,o);function f(){this._detachView(l);d.removeClass(m);n&&n.call(this,i);this._transitioning=false;return this._dequeueActiveView();}k=new c.Parallel({context:this});g={crossView:!!l&&!!i,prepended:o};if(i&&h.viewIn){i.get("container").transition(h.viewIn,g,k.add());}if(l&&h.viewOut){l.get("container").transition(h.viewOut,g,k.add());}k.done(f);}};c.mix(c.Transition.fx,{"app:fadeIn":{opacity:1,duration:0.3,on:{start:function(f){var e={opacity:0},d=f.config;if(d.crossView&&!d.prepended){e.transform="translateX(-100%)";}this.setStyles(e);},end:function(){this.setStyle("transform","translateX(0)");}}},"app:fadeOut":{opacity:0,duration:0.3,on:{start:function(f){var e={opacity:1},d=f.config;if(d.crossView&&d.prepended){e.transform="translateX(-100%)";}this.setStyles(e);},end:function(){this.setStyle("transform","translateX(0)");}}},"app:slideLeft":{duration:0.3,transform:"translateX(-100%)",on:{start:function(){this.setStyles({opacity:1,transform:"translateX(0%)"});},end:function(){this.setStyle("transform","translateX(0)");}}},"app:slideRight":{duration:0.3,transform:"translateX(0)",on:{start:function(){this.setStyles({opacity:1,transform:"translateX(-100%)"});},end:function(){this.setStyle("transform","translateX(0)");}}}});c.App.TransitionsNative=b;c.Base.mix(c.App,[b]);},"3.5.0",{requires:["app-transitions","app-transitions-css","parallel","transition"]});
\ No newline at end of file
+YUI.add("app-transitions-native",function(c){var a=c.App.Transitions;function b(){}b.prototype={initializer:function(){this._transitioning=false;this._viewTransitionQueue=[];c.Do.before(this._queueActiveView,this,"_uiSetActiveView");},_dequeueActiveView:function(){var d=this._viewTransitionQueue,f=d.shift(),e;if(f){if(d.length){e=c.merge(f[2],{transition:false});f.splice(2,1,e);}this._uiTransitionActiveView.apply(this,f);}},_getFx:function(h,d,g){var e=a.FX,f=this.get("transitions");if(g===false||!f){return null;}if(g){return e[g];}if(this._isChildView(h,d)){return e[f.toChild];}if(this._isParentView(h,d)){return e[f.toParent];}return e[f.navigate];},_queueActiveView:function(){var d=c.Array(arguments,0,true);this._viewTransitionQueue.push(d);if(!this._transitioning){this._dequeueActiveView();}return new c.Do.Prevent();},_uiTransitionActiveView:function(i,l,p){p||(p={});var n=p.callback,d,m,e,j,o,h,g,k;if(i===l){n&&n.call(this,i);this._transitioning=false;return this._dequeueActiveView();}h=this._getFx(i,l,p.transition);e=this._isChildView(i,l);j=!e&&this._isParentView(i,l);o=!!p.prepend||j;if(!h){this._attachView(i,o);this._detachView(l);n&&n.call(this,i);this._transitioning=false;return this._dequeueActiveView();}this._transitioning=true;d=this.get("container");m=a.CLASS_NAMES.transitioning;d.addClass(m);this._attachView(i,o);function f(){this._detachView(l);d.removeClass(m);n&&n.call(this,i);this._transitioning=false;return this._dequeueActiveView();}k=new c.Parallel({context:this});g={crossView:!!l&&!!i,prepended:o};if(i&&h.viewIn){i.get("container").transition(h.viewIn,g,k.add());}if(l&&h.viewOut){l.get("container").transition(h.viewOut,g,k.add());}k.done(f);}};c.mix(c.Transition.fx,{"app:fadeIn":{opacity:1,duration:0.3,on:{start:function(f){var e={opacity:0},d=f.config;if(d.crossView&&!d.prepended){e.transform="translateX(-100%)";}this.setStyles(e);},end:function(){this.setStyle("transform","translateX(0)");}}},"app:fadeOut":{opacity:0,duration:0.3,on:{start:function(f){var e={opacity:1},d=f.config;if(d.crossView&&d.prepended){e.transform="translateX(-100%)";}this.setStyles(e);},end:function(){this.setStyle("transform","translateX(0)");}}},"app:slideLeft":{duration:0.3,transform:"translateX(-100%)",on:{start:function(){this.setStyles({opacity:1,transform:"translateX(0%)"});},end:function(){this.setStyle("transform","translateX(0)");}}},"app:slideRight":{duration:0.3,transform:"translateX(0)",on:{start:function(){this.setStyles({opacity:1,transform:"translateX(-100%)"});},end:function(){this.setStyle("transform","translateX(0)");}}}});c.App.TransitionsNative=b;c.Base.mix(c.App,[b]);},"3.5.1",{requires:["app-transitions","app-transitions-css","parallel","transition"]});
\ No newline at end of file
diff --git a/lib/yui/3.5.0/build/app-transitions-native/app-transitions-native.js b/lib/yui/3.5.1/build/app-transitions-native/app-transitions-native.js
similarity index 93%
rename from lib/yui/3.5.0/build/app-transitions-native/app-transitions-native.js
rename to lib/yui/3.5.1/build/app-transitions-native/app-transitions-native.js
index 6eb544884ad..7ee82c60b40 100644
--- a/lib/yui/3.5.0/build/app-transitions-native/app-transitions-native.js
+++ b/lib/yui/3.5.1/build/app-transitions-native/app-transitions-native.js
@@ -1,5 +1,5 @@
/*
-YUI 3.5.0 (build 5089)
+YUI 3.5.1 (build 22)
Copyright 2012 Yahoo! Inc. All rights reserved.
Licensed under the BSD License.
http://yuilibrary.com/license/
@@ -179,11 +179,18 @@ AppTransitionsNative.prototype = {
after new `activeView` is ready to use, the function will be passed:
@param {View} options.callback.view A reference to the new
`activeView`.
- @param {Boolean} [options.prepend] Whether the new view should be
+ @param {Boolean} [options.prepend=false] Whether the `view` should be
prepended instead of appended to the `viewContainer`.
+ @param {Boolean} [options.render] Whether the `view` should be rendered.
+ **Note:** If no value is specified, a view instance will only be
+ rendered if it's newly created by this method.
@param {Boolean|String} [options.transition] Optional transition override.
A transition can be specified which will override the default, or
`false` for no transition.
+ @param {Boolean} [options.update=false] Whether an existing view should
+ have its attributes updated by passing the `config` object to its
+ `setAttrs()` method. **Note:** This option does not have an effect if
+ the `view` instance is created as a result of calling this method.
@protected
@since 3.5.0
**/
@@ -348,4 +355,4 @@ Y.App.TransitionsNative = AppTransitionsNative;
Y.Base.mix(Y.App, [AppTransitionsNative]);
-}, '3.5.0' ,{requires:['app-transitions', 'app-transitions-css', 'parallel', 'transition']});
+}, '3.5.1' ,{requires:['app-transitions', 'app-transitions-css', 'parallel', 'transition']});
diff --git a/lib/yui/3.5.0/build/app-transitions/app-transitions-debug.js b/lib/yui/3.5.1/build/app-transitions/app-transitions-debug.js
similarity index 83%
rename from lib/yui/3.5.0/build/app-transitions/app-transitions-debug.js
rename to lib/yui/3.5.1/build/app-transitions/app-transitions-debug.js
index f6f7249da3d..501bfa77915 100644
--- a/lib/yui/3.5.0/build/app-transitions/app-transitions-debug.js
+++ b/lib/yui/3.5.1/build/app-transitions/app-transitions-debug.js
@@ -1,5 +1,5 @@
/*
-YUI 3.5.0 (build 5089)
+YUI 3.5.1 (build 22)
Copyright 2012 Yahoo! Inc. All rights reserved.
Licensed under the BSD License.
http://yuilibrary.com/license/
@@ -154,6 +154,10 @@ AppTransitions.prototype = {
Sets which view is active/visible for the application. This will set the
app's `activeView` attribute to the specified `view`.
+ The `view` will be "attached" to this app, meaning it will be both rendered
+ into this app's `viewContainer` node and all of its events will bubble to
+ the app. The previous `activeView` will be "detached" from this app.
+
When a string-name is provided for a view which has been registered on this
app's `views` object, the referenced metadata will be used and the
`activeView` will be set to either a preserved view instance, or a new
@@ -166,18 +170,19 @@ AppTransitions.prototype = {
@example
var app = new Y.App({
- transitions: true,
-
views: {
- users: {
+ usersView: {
// Imagine that `Y.UsersView` has been defined.
type: Y.UsersView
}
- }
+ },
+
+ transitions: true,
+ users : new Y.ModelList()
});
app.route('/users/', function () {
- this.showView('users');
+ this.showView('usersView', {users: this.get('users')});
});
app.render();
@@ -186,26 +191,35 @@ AppTransitions.prototype = {
@method showView
@param {String|View} view The name of a view defined in the `views` object,
- or a view instance.
+ or a view instance which should become this app's `activeView`.
@param {Object} [config] Optional configuration to use when creating a new
- view instance.
+ view instance. This config object can also be used to update an existing
+ or preserved view's attributes when `options.update` is `true`.
@param {Object} [options] Optional object containing any of the following
properties:
@param {Function} [options.callback] Optional callback function to call
after new `activeView` is ready to use, the function will be passed:
@param {View} options.callback.view A reference to the new
`activeView`.
- @param {Boolean} [options.prepend] Whether the new view should be
+ @param {Boolean} [options.prepend=false] Whether the `view` should be
prepended instead of appended to the `viewContainer`.
+ @param {Boolean} [options.render] Whether the `view` should be rendered.
+ **Note:** If no value is specified, a view instance will only be
+ rendered if it's newly created by this method.
@param {Boolean|String} [options.transition] Optional transition override.
A transition can be specified which will override the default, or
`false` for no transition.
+ @param {Boolean} [options.update=false] Whether an existing view should
+ have its attributes updated by passing the `config` object to its
+ `setAttrs()` method. **Note:** This option does not have an effect if
+ the `view` instance is created as a result of calling this method.
@param {Function} [callback] Optional callback Function to call after the
new `activeView` is ready to use. **Note:** this will override
- `options.callback`. The function will be passed the following:
+ `options.callback` and it can be specified as either the third or fourth
+ argument. The function will be passed the following:
@param {View} callback.view A reference to the new `activeView`.
@chainable
- @see App.Base.showView()
+ @since 3.5.0
**/
// Does not override `showView()` but does use `options.transitions`.
@@ -221,6 +235,7 @@ AppTransitions.prototype = {
@param {Boolean|Object} transitions The new `transitions` attribute value.
@return {Mixed} The processed value which represents the new state.
@protected
+ @see App.Base.showView()
@since 3.5.0
**/
_setTransitions: function (transitions) {
@@ -239,4 +254,4 @@ Y.App.Transitions = AppTransitions;
Y.Base.mix(Y.App, [AppTransitions]);
-}, '3.5.0' ,{requires:['app-base']});
+}, '3.5.1' ,{requires:['app-base']});
diff --git a/lib/yui/3.5.0/build/app-transitions/app-transitions-min.js b/lib/yui/3.5.1/build/app-transitions/app-transitions-min.js
similarity index 89%
rename from lib/yui/3.5.0/build/app-transitions/app-transitions-min.js
rename to lib/yui/3.5.1/build/app-transitions/app-transitions-min.js
index b37a5f03593..6160fa8b6af 100644
--- a/lib/yui/3.5.0/build/app-transitions/app-transitions-min.js
+++ b/lib/yui/3.5.1/build/app-transitions/app-transitions-min.js
@@ -1,7 +1,7 @@
/*
-YUI 3.5.0 (build 5089)
+YUI 3.5.1 (build 22)
Copyright 2012 Yahoo! Inc. All rights reserved.
Licensed under the BSD License.
http://yuilibrary.com/license/
*/
-YUI.add("app-transitions",function(b){function a(){}a.ATTRS={transitions:{setter:"_setTransitions",value:false}};a.CLASS_NAMES={transitioning:b.ClassNameManager.getClassName("app","transitioning")};a.FX={fade:{viewIn:"app:fadeIn",viewOut:"app:fadeOut"},slideLeft:{viewIn:"app:slideLeft",viewOut:"app:slideLeft"},slideRight:{viewIn:"app:slideRight",viewOut:"app:slideRight"}};a.prototype={transitions:{navigate:"fade",toChild:"slideLeft",toParent:"slideRight"},_setTransitions:function(d){var c=this.transitions;if(d&&d===true){return b.merge(c);}return d;}};b.App.Transitions=a;b.Base.mix(b.App,[a]);},"3.5.0",{requires:["app-base"]});
\ No newline at end of file
+YUI.add("app-transitions",function(b){function a(){}a.ATTRS={transitions:{setter:"_setTransitions",value:false}};a.CLASS_NAMES={transitioning:b.ClassNameManager.getClassName("app","transitioning")};a.FX={fade:{viewIn:"app:fadeIn",viewOut:"app:fadeOut"},slideLeft:{viewIn:"app:slideLeft",viewOut:"app:slideLeft"},slideRight:{viewIn:"app:slideRight",viewOut:"app:slideRight"}};a.prototype={transitions:{navigate:"fade",toChild:"slideLeft",toParent:"slideRight"},_setTransitions:function(d){var c=this.transitions;if(d&&d===true){return b.merge(c);}return d;}};b.App.Transitions=a;b.Base.mix(b.App,[a]);},"3.5.1",{requires:["app-base"]});
\ No newline at end of file
diff --git a/lib/yui/3.5.0/build/app-transitions/app-transitions.js b/lib/yui/3.5.1/build/app-transitions/app-transitions.js
similarity index 83%
rename from lib/yui/3.5.0/build/app-transitions/app-transitions.js
rename to lib/yui/3.5.1/build/app-transitions/app-transitions.js
index f6f7249da3d..501bfa77915 100644
--- a/lib/yui/3.5.0/build/app-transitions/app-transitions.js
+++ b/lib/yui/3.5.1/build/app-transitions/app-transitions.js
@@ -1,5 +1,5 @@
/*
-YUI 3.5.0 (build 5089)
+YUI 3.5.1 (build 22)
Copyright 2012 Yahoo! Inc. All rights reserved.
Licensed under the BSD License.
http://yuilibrary.com/license/
@@ -154,6 +154,10 @@ AppTransitions.prototype = {
Sets which view is active/visible for the application. This will set the
app's `activeView` attribute to the specified `view`.
+ The `view` will be "attached" to this app, meaning it will be both rendered
+ into this app's `viewContainer` node and all of its events will bubble to
+ the app. The previous `activeView` will be "detached" from this app.
+
When a string-name is provided for a view which has been registered on this
app's `views` object, the referenced metadata will be used and the
`activeView` will be set to either a preserved view instance, or a new
@@ -166,18 +170,19 @@ AppTransitions.prototype = {
@example
var app = new Y.App({
- transitions: true,
-
views: {
- users: {
+ usersView: {
// Imagine that `Y.UsersView` has been defined.
type: Y.UsersView
}
- }
+ },
+
+ transitions: true,
+ users : new Y.ModelList()
});
app.route('/users/', function () {
- this.showView('users');
+ this.showView('usersView', {users: this.get('users')});
});
app.render();
@@ -186,26 +191,35 @@ AppTransitions.prototype = {
@method showView
@param {String|View} view The name of a view defined in the `views` object,
- or a view instance.
+ or a view instance which should become this app's `activeView`.
@param {Object} [config] Optional configuration to use when creating a new
- view instance.
+ view instance. This config object can also be used to update an existing
+ or preserved view's attributes when `options.update` is `true`.
@param {Object} [options] Optional object containing any of the following
properties:
@param {Function} [options.callback] Optional callback function to call
after new `activeView` is ready to use, the function will be passed:
@param {View} options.callback.view A reference to the new
`activeView`.
- @param {Boolean} [options.prepend] Whether the new view should be
+ @param {Boolean} [options.prepend=false] Whether the `view` should be
prepended instead of appended to the `viewContainer`.
+ @param {Boolean} [options.render] Whether the `view` should be rendered.
+ **Note:** If no value is specified, a view instance will only be
+ rendered if it's newly created by this method.
@param {Boolean|String} [options.transition] Optional transition override.
A transition can be specified which will override the default, or
`false` for no transition.
+ @param {Boolean} [options.update=false] Whether an existing view should
+ have its attributes updated by passing the `config` object to its
+ `setAttrs()` method. **Note:** This option does not have an effect if
+ the `view` instance is created as a result of calling this method.
@param {Function} [callback] Optional callback Function to call after the
new `activeView` is ready to use. **Note:** this will override
- `options.callback`. The function will be passed the following:
+ `options.callback` and it can be specified as either the third or fourth
+ argument. The function will be passed the following:
@param {View} callback.view A reference to the new `activeView`.
@chainable
- @see App.Base.showView()
+ @since 3.5.0
**/
// Does not override `showView()` but does use `options.transitions`.
@@ -221,6 +235,7 @@ AppTransitions.prototype = {
@param {Boolean|Object} transitions The new `transitions` attribute value.
@return {Mixed} The processed value which represents the new state.
@protected
+ @see App.Base.showView()
@since 3.5.0
**/
_setTransitions: function (transitions) {
@@ -239,4 +254,4 @@ Y.App.Transitions = AppTransitions;
Y.Base.mix(Y.App, [AppTransitions]);
-}, '3.5.0' ,{requires:['app-base']});
+}, '3.5.1' ,{requires:['app-base']});
diff --git a/lib/yui/3.5.0/build/array-extras/array-extras-debug.js b/lib/yui/3.5.1/build/array-extras/array-extras-debug.js
similarity index 99%
rename from lib/yui/3.5.0/build/array-extras/array-extras-debug.js
rename to lib/yui/3.5.1/build/array-extras/array-extras-debug.js
index 8a632e5a7b1..c334cb23a16 100644
--- a/lib/yui/3.5.0/build/array-extras/array-extras-debug.js
+++ b/lib/yui/3.5.1/build/array-extras/array-extras-debug.js
@@ -1,5 +1,5 @@
/*
-YUI 3.5.0 (build 5089)
+YUI 3.5.1 (build 22)
Copyright 2012 Yahoo! Inc. All rights reserved.
Licensed under the BSD License.
http://yuilibrary.com/license/
@@ -364,4 +364,4 @@ A.zip = function(a, a2) {
};
-}, '3.5.0' ,{requires:['yui-base']});
+}, '3.5.1' ,{requires:['yui-base']});
diff --git a/lib/yui/3.5.0/build/array-extras/array-extras-min.js b/lib/yui/3.5.1/build/array-extras/array-extras-min.js
similarity index 96%
rename from lib/yui/3.5.0/build/array-extras/array-extras-min.js
rename to lib/yui/3.5.1/build/array-extras/array-extras-min.js
index 20bf712c7d0..e576532ee7f 100644
--- a/lib/yui/3.5.0/build/array-extras/array-extras-min.js
+++ b/lib/yui/3.5.1/build/array-extras/array-extras-min.js
@@ -1,7 +1,7 @@
/*
-YUI 3.5.0 (build 5089)
+YUI 3.5.1 (build 22)
Copyright 2012 Yahoo! Inc. All rights reserved.
Licensed under the BSD License.
http://yuilibrary.com/license/
*/
-YUI.add("array-extras",function(d){var b=d.Array,a=d.Lang,c=Array.prototype;b.lastIndexOf=a._isNative(c.lastIndexOf)?function(e,g,f){return f||f===0?e.lastIndexOf(g,f):e.lastIndexOf(g);}:function(f,j,h){var e=f.length,g=e-1;if(h||h===0){g=Math.min(h<0?e+h:h,e);}if(g>-1&&e>0){for(;g>-1;--g){if(g in f&&f[g]===j){return g;}}}return -1;};b.unique=function(f,l){var k=0,e=f.length,h=[],m,g;for(;k{message}'+"",i=d.Lang,k=d.Node.create,ab=i.isNumber,m=i.isString,P=d.merge,aa=d.substitute;function u(){u.superclass.constructor.apply(this,arguments);}d.Console=d.extend(u,d.Widget,{_evtCat:null,_head:null,_body:null,_foot:null,_printLoop:null,buffer:null,log:function(){d.log.apply(d,arguments);return this;},clearConsole:function(){this._body.empty();this._cancelPrintLoop();this.buffer=[];return this;},reset:function(){this.fire(W);return this;},collapse:function(){this.set(s,true);return this;},expand:function(){this.set(s,false);return this;},printBuffer:function(Y){var aj=this.buffer,ae=d.config.debug,L=[],ag=this.get("consoleLimit"),ai=this.get("newestOnTop"),af=ai?this._body.get("firstChild"):null,ah;if(aj.length>ag){aj.splice(0,aj.length-ag);}Y=Math.min(aj.length,(Y||aj.length));d.config.debug=false;if(!this.get(D)&&this.get("rendered")){for(ah=0;ah