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

selectbefore/selectafter -> selectprevious/selectnext

Browse source
This commit is contained in:
rlx 2013-05-08 16:53:33 +00:00
parent 9d802dbf49
commit 74e6c12904
4 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
source/Ox.UI/js/Form/ArrayEditable.js
View file

@ -12,8 +12,8 @@ Ox.ArrayEditable <f> Array Editable
edit <!> edit edit <!> edit
insert <!> insert insert <!> insert
open <!> open open <!> open
selectafter <!> selectafter selectnext <!> selectnext
selectbefore <!> selectbefore selectprevious <!> selectprevious
selectnone <!> selectnone selectnone <!> selectnone
select <!> select select <!> select
submit <!> submit submit <!> submit
@ -239,7 +239,7 @@ Ox.ArrayEditable = function(options, self) {
if (self.selected > -1) { if (self.selected > -1) {
self.selected > 0 self.selected > 0
? selectItem(0) ? selectItem(0)
: that.triggerEvent('selectbefore'); : that.triggerEvent('selectprevious');
} }
} }
@ -264,7 +264,7 @@ Ox.ArrayEditable = function(options, self) {
if (self.selected > -1) { if (self.selected > -1) {
self.selected < self.options.items.length - 1 self.selected < self.options.items.length - 1
? selectItem(self.options.items.length - 1) ? selectItem(self.options.items.length - 1)
: that.triggerEvent('selectafter'); : that.triggerEvent('selectnext');
} }
} }
@ -272,7 +272,7 @@ Ox.ArrayEditable = function(options, self) {
if (self.selected > -1) { if (self.selected > -1) {
self.selected < self.options.items.length - 1 self.selected < self.options.items.length - 1
? selectItem(self.selected + 1) ? selectItem(self.selected + 1)
: that.triggerEvent('selectafter'); : that.triggerEvent('selectnext');
} }
} }
@ -284,7 +284,7 @@ Ox.ArrayEditable = function(options, self) {
if (self.selected > -1) { if (self.selected > -1) {
self.selected > 0 self.selected > 0
? selectItem(self.selected - 1) ? selectItem(self.selected - 1)
: that.triggerEvent('selectbefore'); : that.triggerEvent('selectprevious');
} }
} }

8
source/Ox.UI/js/List/List.js
View file

@ -50,8 +50,8 @@ Ox.List <f> List constructor
openpreview <!> preview of selected item opened openpreview <!> preview of selected item opened
closepreview <!> preview closed closepreview <!> preview closed
select <!> select item select <!> select item
selectafter <!> selectafter selectnext <!> selectnext
selectbefore <!> selectbefore selectprevious <!> selectprevious
toggle <!> toggle toggle <!> toggle
@*/ @*/
@ -1178,7 +1178,7 @@ Ox.List = function(options, self) {
select(pos); select(pos);
scrollToPosition(pos); scrollToPosition(pos);
} else if (self.selected.length) { } else if (self.selected.length) {
that.triggerEvent('selectafter'); that.triggerEvent('selectnext');
} }
} }
@ -1192,7 +1192,7 @@ Ox.List = function(options, self) {
select(pos); select(pos);
scrollToPosition(pos); scrollToPosition(pos);
} else if (self.selected.length) { } else if (self.selected.length) {
that.triggerEvent('selectbefore'); that.triggerEvent('selectprevious');
} }
} }

14
source/Ox.UI/js/Video/AnnotationFolder.js
View file

@ -20,8 +20,8 @@ Ox.AnnotationFolder <f> AnnotationFolder Object
key_* <!> key_* key_* <!> key_*
open <!> open open <!> open
remove <!> remove remove <!> remove
selectafter <!> selectafter selectnext <!> selectnext
selectbefore <!> selectbefore selectprevious <!> selectprevious
selectnone <!> selectnone selectnone <!> selectnone
select <!> select select <!> select
submit <!> submit submit <!> submit
@ -307,11 +307,11 @@ Ox.AnnotationFolder = function(options, self) {
that.triggerEvent('open'); that.triggerEvent('open');
}, },
select: selectAnnotation, select: selectAnnotation,
selectafter: function() { selectnext: function() {
that.triggerEvent('selectafter'); that.triggerEvent('selectnext');
}, },
selectbefore: function() { selectprevious: function() {
that.triggerEvent('selectbefore'); that.triggerEvent('selectprevious');
}, },
selectnone: function() { selectnone: function() {
that.triggerEvent('selectnone'); that.triggerEvent('selectnone');
@ -652,7 +652,7 @@ Ox.AnnotationFolder = function(options, self) {
self.$annotations.gainFocus(); self.$annotations.gainFocus();
} else { } else {
that.triggerEvent( that.triggerEvent(
position == 0 ? 'selectafter' : 'selectbefore' position == 0 ? 'selectnext' : 'selectprevious'
); );
} }
}; };

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

@ -340,10 +340,10 @@ Ox.AnnotationPanel = function(options, self) {
select: function(data) { select: function(data) {
selectAnnotation(data, index); selectAnnotation(data, index);
}, },
selectafter: function() { selectnext: function() {
selectNext(layer.id, 1); selectNext(layer.id, 1);
}, },
selectbefore: function() { selectprevious: function() {
selectNext(layer.id, -1); selectNext(layer.id, -1);
}, },
selectnone: selectNone, selectnone: selectNone,