0x2620/oxjs
2
0
Fork 1
Code Issues 172 Pull requests Releases Wiki Activity

add mail svg; update form elements; change 'focusInput()' signature

Browse source
This commit is contained in:
rlx 2011-12-18 09:29:35 +00:00
parent 8f3be96828
commit 4701245038
8 changed files with 104 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/Ox.UI/js/Form/Ox.Button.js
View file

@ -180,6 +180,10 @@ Ox.Button = function(options, self) {
return that;
}
that.value = function() {
return self.options.title;
};
return that;
};

7
source/Ox.UI/js/Form/Ox.ButtonGroup.js
View file

@ -53,6 +53,7 @@ Ox.ButtonGroup = function(options, self) {
size: self.options.size,
style: self.options.style,
title: button.title,
tooltip: button.tooltip,
type: self.options.type
})
.bindEvent('select', function() {
@ -84,6 +85,12 @@ Ox.ButtonGroup = function(options, self) {
}
};
that.value = function() {
return self.optionGroup.selected().map(function(i) {
return self.options.buttons[i].id;
});
};
return that;
};

34
source/Ox.UI/js/Form/Ox.Input.js
View file

@ -828,12 +828,8 @@ Ox.Input = function(options, self) {
} else if (key == 'disabled') {
self.$input.attr({disabled: value});
} else if (key == 'height') {
that.css({
height: value + 'px'
});
self.$input.css({
height: value + 'px'
});
that.css({height: value + 'px'});
self.$input.css({height: value - 6 + 'px'});
} else if (key == 'labelWidth') {
self.$label.options({width: value});
inputWidth = getInputWidth();
@ -874,15 +870,25 @@ Ox.Input = function(options, self) {
return that;
}
that.focusInput = function(select) {
// fixme: don't we have a convention that booleans are false by default?
select = Ox.isUndefined(select) ? true : select;
/*@
focusInput <f> Focus input element
(select) -> <o> Input object
(start, end) -> <o> Input object
select <b|false> If true, select all, otherwise position cursor at the end
start <n> Selection start (can be negative)
end <n> Selection end (can be negative), or equal to start if omitted
@*/
that.focusInput = function() {
var length = self.$input.val().length,
start = Ox.isNumber(arguments[0])
? (arguments[0] < 0 ? length + arguments[0] : arguments[0])
: 0,
stop = Ox.isNumber(arguments[1])
? (arguments[1] < 0 ? length + arguments[1] : arguments[1])
: Ox.isNumber(arguments[0]) ? arguments[0]
: arguments[0] ? length : 0;
self.$input.focus();
if (select) {
cursor(0, self.$input.val().length);
} else {
cursor(self.$input.val().length);
}
cursor(start, stop);
return that;
};

4
source/Ox.UI/js/Form/Ox.Select.js
View file

@ -236,12 +236,12 @@ Ox.Select = function(options, self) {
() -> <o> returns object of selected items with id, title
@*/
that.selected = function() {
return /*self.checked*/self.optionGroup.checked().map(function(v) {
return self.options.selectable ? self.optionGroup.checked().map(function(v) {
return {
id: self.options.items[v].id,
title: self.options.items[v].title
};
});
}) : [];
};
/*@

2
source/Ox.UI/themes/classic/_index.html
View file

@ -66,7 +66,7 @@
'Upload', 'Download',
'Copyright', 'NoCopyright',
'Click', 'Delete', 'Edit', 'Find', 'Flag', 'Icon', 'Like',
'Publish', 'Set', 'Star', 'User', 'View', 'Loading'
'Mail', 'Publish', 'Set', 'Star', 'User', 'View', 'Loading'
].forEach(function(symbol) {
var $symbol, src = 'svg/symbol' + symbol + '.svg';
console.log(symbol)

8
source/Ox.UI/themes/classic/svg/symbolMail.svg Normal file
View file

@ -0,0 +1,8 @@
<svg xmlns="http://www.w3.org/2000/svg" width="256" height="256">
<g fill="none" stroke="#404040" stroke-width="24">
<rect x="28" y="60" width="200" height="136"/>
<path d="M 28,60 l 100,100 l 100,-100"/>
<line x1="28" y1="196" x2="92" y2="132" stroke-width="12"/>
<line x1="162" y1="132" x2="228" y2="196" stroke-width="12"/>
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 378 B

2
source/Ox/js/Collection.js
View file

@ -671,7 +671,7 @@ Ox.sub = function(col, start, stop) {
stop = stop < 0 ? col.length + stop : stop;
return Ox.isArray(col) ? Ox.filter(col, function(val, key) {
return key >= start && key < stop;
}) : col.substring(start, stop);
}) : col.substring(start, Math.max(start, stop));
}
/*@

61
source/Ox/js/String.js
View file

@ -162,6 +162,67 @@ Ox.parseSRT = function(str, fps) {
});
};
Ox.parseUserAgent = function(str) {
var names = {
chromeframe: 'Internet Explorer (Chrome Frame)',
'iPhone OS': 'iOS',
Fennec: 'Mobile Firefox',
Mobile: 'Mobile Safari',
MSIE: 'Internet Explorer',
},
regexps = {
browser: [
/(chromeframe)\/(\d+)/,
/(Chrome)\/(\d+)/,
/(Fennec)\/(\d+)/,
/(Firefox)\/(\d+)/,
/(MSIE)\/(\d+)/,
/(Opera)\/.+Version\/(\d+)/,
/Version\/(\d+).+(Mobile)\/.+Safari/,
/Version\/(\d+).+(Safari)/
],
system: [
/(iPhone OS) (\d+)/,
/ (Linux) /,
/(Mac OS X) (10.\d)/,
/(Windows) (NT \d\.\d)/
]
},
userAgent = {
browser: {name: '', version: ''},
system: {name: '', version: ''}
},
versions = {
'10.3': 'Panther',
'10.4': 'Tiger',
'10.5': 'Leopard',
'10.6': 'Snow Leopard',
'10.7': 'Lion',
'NT 5.0': '2000',
'NT 5.1': 'XP',
'NT 5.2': '2003',
'NT 6.0': 'Vista',
'NT 6.1': '7'
}
Ox.forEach(regexps, function(regexps, key) {
regexps.forEach(function(regexp) {
var matches = str.match(regexp), name, swap, version;
if (matches) {
matches[2] = matches[2] || '';
swap = matches[1].match(/^\d+$/);
name = matches[swap ? 2 : 1];
version = matches[swap ? 1 : 2].replace('_', '.');
userAgent[key] = {
name: names[name] || name,
version: versions[version] || version
};
return false;
}
});
});
return userAgent;
};
/*@
Ox.repeat <f> Repeat a value multiple times
Works for arrays, numbers and strings