javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-22 21:48:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

test(virtualScroll): fix virtual scroll unit test

Browse Source
This commit is contained in:
Adam Bradley
2016-05-17 07:46:58 -05:00
parent 55ec80a479
commit 8b09733124
2 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ionic/components/virtual-scroll/test/virtual-scroll.spec.ts
View File

@ -535,7 +535,7 @@ describe('VirtualScroll', () => {
function getView(width?:number, height?: number, top?: number, left?: number): any {
return {
setLocal: function(){},
context: {},
rootNodes: [{
nodeType: 1,
offsetWidth: width,

28
ionic/util/datetime-util.ts
View File

@ -278,23 +278,21 @@ export function parseTemplate(template: string): string[] {
let words = template.split(' ').filter(w => w.length > 0);
words.forEach((word, i) => {
if (word.length) {
FORMAT_KEYS.forEach(format => {
if (word === format.f) {
if (word === FORMAT_A || word === FORMAT_a) {
// this format is an am/pm format, so it's an "a" or "A"
if ((formats.indexOf(FORMAT_h) < 0 && formats.indexOf(FORMAT_hh) < 0) ||
(words[i - 1] !== FORMAT_m && words[i - 1] !== FORMAT_mm)) {
// template does not already have a 12-hour format
// or this am/pm format doesn't have a minute format immediately before it
// so do not treat this word "a" or "A" as an am/pm format
return;
}
FORMAT_KEYS.forEach(format => {
if (word === format.f) {
if (word === FORMAT_A || word === FORMAT_a) {
// this format is an am/pm format, so it's an "a" or "A"
if ((formats.indexOf(FORMAT_h) < 0 && formats.indexOf(FORMAT_hh) < 0) ||
(words[i - 1] !== FORMAT_m && words[i - 1] !== FORMAT_mm)) {
// template does not already have a 12-hour format
// or this am/pm format doesn't have a minute format immediately before it
// so do not treat this word "a" or "A" as an am/pm format
return;
}
formats.push(word);
}
});
}
formats.push(word);
}
});
});
return formats;