Skip to content

Commit

Permalink
AUI-452 Updating Alloy to YUI 3.4.0 (master development)
Browse files Browse the repository at this point in the history
  • Loading branch information
@eduardolundgren
eduardolundgren committed Jun 24, 2011
1 parent e8bdfb5 commit 2a07481
Show file tree
Hide file tree
Showing 2,100 changed files with 257,665 additions and 52,813 deletions.
361 changes: 0 additions & 361 deletions .gitignore
View file

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions .gitmodules
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "lib/yui3"]
path = lib/yui3
url = git://github.com/liferay/yui3.git
2 changes: 1 addition & 1 deletion build.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ release.version=1.0.1
yui3.build.version=nightly
yui3.dir=${project.dir}/lib/yui3/
yui3.file=yui3.zip
yui3.version=3.3.0
yui3.version=3.4.0

build.aui.prefix=

Expand Down
280 changes: 1 addition & 279 deletions build.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -289,20 +289,13 @@
<target name="init-yui">
<echo>Initializing YUI Library.</echo>

<antcall target="generate-yui" />

<antcall target="patch-yui" />

<antcall target="export-yui" />

<antcall target="copyright-yui" />
</target>

<target name="generate-yui">
<delete dir="${yui3.dir}" />
<unzip src="${project.dir}/lib/${yui3.file}" dest="${project.dir}/lib/" />
</target>

<target name="export-yui">
<echo>Copying files from [${project.dir}/lib/yui3/build] to [${project.dir}/build].</echo>

Expand Down Expand Up @@ -345,280 +338,9 @@
</then>
</if>

<!-- Patch for AUI-153 -->
<replace file="${project.dir}/lib/yui3/src/dom/js/dom.js">
<replacetoken><![CDATA[if (m && custom[m[1]]) {
if (typeof custom[m[1]] === 'function') {
create = custom[m[1]];
} else {
tag = custom[m[1]];
}
}]]></replacetoken>
<replacevalue><![CDATA[var creator = m && custom[m[1].toLowerCase()];
if (creator) {
if (typeof creator === 'function') {
create = creator;
} else {
tag = creator;
}
}]]></replacevalue>
</replace>
<!-- /End Patch -->

<!-- Patch for AUI-284 -->
<replace file="${project.dir}/lib/yui3/src/io/js/io-upload-iframe.js">
<replacetoken><![CDATA[f.setAttribute(p, f[p]);]]></replacetoken>
<replacevalue><![CDATA[f.setAttribute(p, a[p]);]]></replacevalue>
</replace>
<!-- /End Patch -->

<!-- Patch for AUI-364 -->
<replace file="${project.dir}/lib/yui3/src/transition/js/transition-native.js">
<replacetoken><![CDATA[Y.Node.prototype.toggleView = function(name, on) {
var callback;
this._toggles = this._toggles || [];
if (typeof name == 'boolean') { // no transition, just toggle
on = name;
}
if (typeof on === 'undefined' && name in this._toggles) {
on = ! this._toggles[name];
}
on = (on) ? 1 : 0;
if (on) {
this._show();
} else {
callback = _wrapCallBack(anim, this._hide);
}
this._toggles[name] = on;
this.transition(Y.Transition.toggles[name][on], callback);
};
Y.NodeList.prototype.toggleView = function(config, callback) {
var nodes = this._nodes,
i = 0,
node;
while ((node = nodes[i++])) {
Y.one(node).toggleView(config, callback);
}
return this;
};
Y.mix(Transition.fx, {
fadeOut: {
opacity: 0,
duration: 0.5,
easing: 'ease-out'
},
fadeIn: {
opacity: 1,
duration: 0.5,
easing: 'ease-in'
},
sizeOut: {
height: 0,
width: 0,
duration: 0.75,
easing: 'ease-out'
},
sizeIn: {
height: function(node) {
return node.get('scrollHeight') + 'px';
},
width: function(node) {
return node.get('scrollWidth') + 'px';
},
duration: 0.5,
easing: 'ease-in',
on: {
start: function() {
var overflow = this.getStyle('overflow');
if (overflow !== 'hidden') { // enable scrollHeight/Width
this.setStyle('overflow', 'hidden');
this._transitionOverflow = overflow;
}
},
end: function() {
if (this._transitionOverflow) { // revert overridden value
this.setStyle('overflow', this._transitionOverflow);
}
}
}
}
});
Y.mix(Transition.toggles, {
size: ['sizeIn', 'sizeOut'],
fade: ['fadeOut', 'fadeIn']
});]]></replacetoken>
<replacevalue><![CDATA[Y.Node.prototype.toggleView = function(name, on, callback) {
this._toggles = this._toggles || [];
callback = arguments[arguments.length - 1];
if (typeof name == 'boolean') { // no transition, just toggle
on = name;
name = null;
}
name = name || Y.Transition.DEFAULT_TOGGLE;
if (typeof on == 'undefined' && name in this._toggles) { // reverse current toggle
on = ! this._toggles[name];
}
on = (on) ? 1 : 0;
if (on) {
this._show();
} else {
callback = _wrapCallBack(this, this._hide, callback);
}
this._toggles[name] = on;
this.transition(Y.Transition.toggles[name][on], callback);
return this;
};
Y.NodeList.prototype.toggleView = function(name, on, callback) {
var nodes = this._nodes,
i = 0,
node;
while ((node = nodes[i++])) {
Y.one(node).toggleView(name, on, callback);
}
return this;
};
Y.mix(Transition.fx, {
fadeOut: {
opacity: 0,
duration: 0.5,
easing: 'ease-out'
},
fadeIn: {
opacity: 1,
duration: 0.5,
easing: 'ease-in'
},
sizeOut: {
height: 0,
width: 0,
duration: 0.75,
easing: 'ease-out'
},
sizeIn: {
height: function(node) {
return node.get('scrollHeight') + 'px';
},
width: function(node) {
return node.get('scrollWidth') + 'px';
},
duration: 0.5,
easing: 'ease-in',
on: {
start: function() {
var overflow = this.getStyle('overflow');
if (overflow !== 'hidden') { // enable scrollHeight/Width
this.setStyle('overflow', 'hidden');
this._transitionOverflow = overflow;
}
},
end: function() {
if (this._transitionOverflow) { // revert overridden value
this.setStyle('overflow', this._transitionOverflow);
}
}
}
}
});
Y.mix(Transition.toggles, {
size: ['sizeOut', 'sizeIn'],
fade: ['fadeOut', 'fadeIn']
});
Transition.DEFAULT_TOGGLE = 'fade';]]></replacevalue>
</replace>
<!-- Patch for AUI- -->
<!-- /End Patch -->

<!-- Patch for #2529861 -->
<replace file="${project.dir}/lib/yui3/src/recordset/js/recordset-base.js">
<replacetoken><![CDATA[this.after('update',
function(e) {
this._defEmptyHash();
});]]></replacetoken>
<replacevalue><![CDATA[this.after('empty',
function(e) {
this._defEmptyHash();
});]]></replacevalue>
</replace>
<!-- /End Patch -->

<!-- Patch for #2529933 -->
<replace file="${project.dir}/lib/yui3/src/node/js/nodelist-array.js">
<replacetoken><![CDATA[while ((arg = arguments[i++])) {]]></replacetoken>
<replacevalue><![CDATA[while (typeof (arg = arguments[i++]) != 'undefined') {]]></replacevalue>
</replace>
<!-- /End Patch -->

<!-- Rebuilding YUI modules -->
<subant target="all" failonerror="false">
<property name="lint.skip" value="true"/>
<fileset
dir="${project.dir}/lib/yui3/src/dom"
includes="build.xml"
/>
</subant>

<subant target="all" failonerror="false">
<property name="lint.skip" value="true"/>
<fileset
dir="${project.dir}/lib/yui3/src/io"
includes="build.xml"
/>
</subant>

<subant target="all" failonerror="false">
<property name="lint.skip" value="true"/>
<fileset
dir="${project.dir}/lib/yui3/src/transition"
includes="build.xml"
/>
</subant>

<subant target="all" failonerror="false">
<property name="lint.skip" value="true"/>
<fileset
dir="${project.dir}/lib/yui3/src/recordset"
includes="build.xml"
/>
</subant>

<subant target="all" failonerror="false">
<property name="lint.skip" value="true"/>
<fileset
dir="${project.dir}/lib/yui3/src/node"
includes="build.xml"
/>
</subant>
</target>

<target name="create-release">
Expand Down
Loading

0 comments on commit 2a07481

Please sign in to comment.