Skip to content

Commit

Permalink
Merge branch 'dev-master' into dev-3.x
Browse files Browse the repository at this point in the history 
Conflicts:
	build/yui-base/yui-base-coverage.js
	build/yui-base/yui-base-min.js
	build/yui-core/yui-core-coverage.js
	build/yui-core/yui-core-min.js
	build/yui-nodejs/yui-nodejs-coverage.js
	build/yui-nodejs/yui-nodejs-min.js
	build/yui/yui-coverage.js
	build/yui/yui-min.js
  • Loading branch information
@okuryu
okuryu committed Aug 19, 2014
2 parents bb399c2 + 94b6fae commit 157e5b6
Show file tree
Hide file tree
Showing 18 changed files with 48 additions and 64 deletions.
4 changes: 2 additions & 2 deletions build/yui-base/yui-base-coverage.js
View file

Large diffs are not rendered by default.

4 changes: 1 addition & 3 deletions build/yui-base/yui-base-debug.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4000,9 +4000,7 @@ YUI.Env.parseUA = function(subUA) {
}
}
if (/ Android/.test(ua)) {
if (/Mobile/.test(ua)) {
o.mobile = 'Android';
}
o.mobile = 'Android';
m = ua.match(/Android ([^\s]*);/);
if (m && m[1]) {
o.android = numberify(m[1]);
Expand Down
8 changes: 4 additions & 4 deletions build/yui-base/yui-base-min.js
View file

Large diffs are not rendered by default.

4 changes: 1 addition & 3 deletions build/yui-base/yui-base.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3753,9 +3753,7 @@ YUI.Env.parseUA = function(subUA) {
}
}
if (/ Android/.test(ua)) {
if (/Mobile/.test(ua)) {
o.mobile = 'Android';
}
o.mobile = 'Android';
m = ua.match(/Android ([^\s]*);/);
if (m && m[1]) {
o.android = numberify(m[1]);
Expand Down
4 changes: 2 additions & 2 deletions build/yui-core/yui-core-coverage.js
View file

Large diffs are not rendered by default.

4 changes: 1 addition & 3 deletions build/yui-core/yui-core-debug.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4000,9 +4000,7 @@ YUI.Env.parseUA = function(subUA) {
}
}
if (/ Android/.test(ua)) {
if (/Mobile/.test(ua)) {
o.mobile = 'Android';
}
o.mobile = 'Android';
m = ua.match(/Android ([^\s]*);/);
if (m && m[1]) {
o.android = numberify(m[1]);
Expand Down
2 changes: 1 addition & 1 deletion build/yui-core/yui-core-min.js
View file

Large diffs are not rendered by default.

4 changes: 1 addition & 3 deletions build/yui-core/yui-core.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3753,9 +3753,7 @@ YUI.Env.parseUA = function(subUA) {
}
}
if (/ Android/.test(ua)) {
if (/Mobile/.test(ua)) {
o.mobile = 'Android';
}
o.mobile = 'Android';
m = ua.match(/Android ([^\s]*);/);
if (m && m[1]) {
o.android = numberify(m[1]);
Expand Down
4 changes: 2 additions & 2 deletions build/yui-nodejs/yui-nodejs-coverage.js
View file

Large diffs are not rendered by default.

4 changes: 1 addition & 3 deletions build/yui-nodejs/yui-nodejs-debug.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4000,9 +4000,7 @@ YUI.Env.parseUA = function(subUA) {
}
}
if (/ Android/.test(ua)) {
if (/Mobile/.test(ua)) {
o.mobile = 'Android';
}
o.mobile = 'Android';
m = ua.match(/Android ([^\s]*);/);
if (m && m[1]) {
o.android = numberify(m[1]);
Expand Down
20 changes: 10 additions & 10 deletions build/yui-nodejs/yui-nodejs-min.js
View file

Large diffs are not rendered by default.

4 changes: 1 addition & 3 deletions build/yui-nodejs/yui-nodejs.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3753,9 +3753,7 @@ YUI.Env.parseUA = function(subUA) {
}
}
if (/ Android/.test(ua)) {
if (/Mobile/.test(ua)) {
o.mobile = 'Android';
}
o.mobile = 'Android';
m = ua.match(/Android ([^\s]*);/);
if (m && m[1]) {
o.android = numberify(m[1]);
Expand Down
4 changes: 2 additions & 2 deletions build/yui/yui-coverage.js
View file

Large diffs are not rendered by default.

4 changes: 1 addition & 3 deletions build/yui/yui-debug.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4000,9 +4000,7 @@ YUI.Env.parseUA = function(subUA) {
}
}
if (/ Android/.test(ua)) {
if (/Mobile/.test(ua)) {
o.mobile = 'Android';
}
o.mobile = 'Android';
m = ua.match(/Android ([^\s]*);/);
if (m && m[1]) {
o.android = numberify(m[1]);
Expand Down
26 changes: 13 additions & 13 deletions build/yui/yui-min.js
View file

Large diffs are not rendered by default.

4 changes: 1 addition & 3 deletions build/yui/yui.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3753,9 +3753,7 @@ YUI.Env.parseUA = function(subUA) {
}
}
if (/ Android/.test(ua)) {
if (/Mobile/.test(ua)) {
o.mobile = 'Android';
}
o.mobile = 'Android';
m = ua.match(/Android ([^\s]*);/);
if (m && m[1]) {
o.android = numberify(m[1]);
Expand Down
4 changes: 3 additions & 1 deletion src/yui/HISTORY.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ YUI Core Change History
@VERSION@
------

* No changes.
* [#1935][]: Mark all Android devices as "mobile". (@nolanlawson)

[#1935]: https://github.com/yui/yui3/pull/1935

3.17.2
------
Expand Down
4 changes: 1 addition & 3 deletions src/yui/js/yui-ua.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -351,9 +351,7 @@ YUI.Env.parseUA = function(subUA) {
}
}
if (/ Android/.test(ua)) {
if (/Mobile/.test(ua)) {
o.mobile = 'Android';
}
o.mobile = 'Android';
m = ua.match(/Android ([^\s]*);/);
if (m && m[1]) {
o.android = numberify(m[1]);
Expand Down

0 comments on commit 157e5b6

Please sign in to comment.