← Back to branch summary

~ted/lazr-js/annoying-debug-message

« back to all changes in this revision

Viewing changes to src-js/lazrjs/yui/oop/oop.js

  • Committer: Launchpad Patch Queue Manager
  • Date: 2010-09-09 14:20:30 UTC
  • mfrom: (182.1.3 yui-3.2)
  • Revision ID: launchpad@pqm.canonical.com-20100909142030-13w6vo0ixfysxc15
[r=beuno] Update lazr-js to yui-3.2

Show diffs side-by-side

added added

removed removed

Lines of Context:
src-js/lazrjs/yui/oop/oop.js
2
2
Copyright (c) 2010, Yahoo! Inc. All rights reserved.
3
3
Code licensed under the BSD License:
4
4
http://developer.yahoo.com/yui/license.html
5
 
version: 3.1.2
6
 
build: 56
 
5
version: 3.2.0
 
6
build: 2676
7
7
*/
8
8
YUI.add('oop', function(Y) {
9
9
 
68
68
            rProto           = r.prototype, 
69
69
            target           = rProto || r, 
70
70
            applyConstructor = false,
71
 
            sequestered, replacements, i;
 
71
            sequestered, replacements;
72
72
 
73
73
        // working on a class, so apply constructor infrastructure
74
74
        if (rProto && construct) {
83
83
 
84
84
// overwrite the prototype with all of the sequestered functions,
85
85
// but only if it hasn't been overridden
86
 
                    for (i in sequestered) {
 
86
                    for (var i in sequestered) {
87
87
                        if (sequestered.hasOwnProperty(i) && (this[i] === replacements[i])) {
88
88
                            this[i] = sequestered[i];
89
89
                        }
137
137
     * will be overwritten if found on the supplier.
138
138
     * @param wl {string[]} a whitelist.  If supplied, only properties in 
139
139
     * this list will be applied to the receiver.
140
 
     * @return {object} the extended object
 
140
     * @return the extended object
141
141
     */
142
142
    Y.aggregate = function(r, s, ov, wl) {
143
143
        return Y.mix(r, s, ov, wl, 0, true);
153
153
     * @param {Function} s the object to inherit
154
154
     * @param {Object} px prototype properties to add/override
155
155
     * @param {Object} sx static properties to add/override
156
 
     * @return {YUI} the YUI instance
 
156
     * @return the extended object
157
157
     */
158
158
    Y.extend = function(r, s, px, sx) {
159
159
        if (!s||!r) {
361
361
 
362
362
 
363
363
 
364
 
}, '3.1.2' );
 
364
}, '3.2.0' );