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

fix find

Browse source
This commit is contained in:
j 2014-09-13 15:59:44 +01:00
parent ab789fcfb4
commit 6a9b60ddca
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/Ox.UI/js/Video/AnnotationPanel.js
View file

@ -261,8 +261,8 @@ Ox.AnnotationPanel = function(options, self) {
isString ? [ isString ? [
{}, {},
{id: 'annotation', title: annotationTitle, disabled: true}, {id: 'annotation', title: annotationTitle, disabled: true},
{id: 'find', title: Ox._('Find in This {0}', Ox.toTitleCase(self.options.itemName.singular))}, {id: 'find', title: Ox._('Find in This {0}', [Ox.toTitleCase(self.options.itemName.singular)])},
{id: 'findannotations', title: Ox._('Find in All {0}', Ox.toTitleCase(self.options.itemName.plural))} {id: 'findannotations', title: Ox._('Find in All {0}', [Ox.toTitleCase(self.options.itemName.plural)])}
] : [] ] : []
), ),
maxWidth: 256, maxWidth: 256,

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

@ -252,6 +252,8 @@ Ox.makeDate <f> Takes a date, number or string, returns a date
'1970' '1970'
> Ox.formatDate(Ox.makeDate('1970-05'), '%Y-%m') > Ox.formatDate(Ox.makeDate('1970-05'), '%Y-%m')
'1970-05' '1970-05'
> Ox.formatDate(Ox.makeDate(Ox.parseDate('-50')), '%Y')
'-50'
@*/ @*/
Ox.makeDate = function(date) { Ox.makeDate = function(date) {
// Safari 4/5 (<= 534.59.10) doesn't parse YYYY, YYYY-MM or YYYY-MM-DD // Safari 4/5 (<= 534.59.10) doesn't parse YYYY, YYYY-MM or YYYY-MM-DD