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

make doubleclicking on non-editable annotation 'open' it, i.e. go to its in point

Browse source
This commit is contained in:
rlx 2012-02-19 11:06:03 +00:00
parent 94cfbdb45c
commit 529184887a
6 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -161,16 +161,19 @@ Ox.ArrayEditable = function(options, self) {
value: data.value
});
},
edit: function(data) {
edit: function() {
if (item.id != self.options.selected) {
selectItem(item.id);
}
self.editing = true;
that.triggerEvent('edit', data);
that.triggerEvent('edit');
},
insert: function(data) {
that.triggerEvent('insert', data);
},
open: function(data) {
that.triggerEvent('open');
},
submit: function(data) {
self.editing = false;
that.gainFocus();
@ -362,6 +365,8 @@ Ox.ArrayEditable = function(options, self) {
if (self.options.editable && self.options.selected) {
self.editing = true;
self.$items[self.selected].options({editing: true});
} else if (!self.options.editable) {
that.triggerEvent('open');
}
return that;
};

2
source/Ox.UI/js/Form/Ox.Editable.js
View file

@ -149,6 +149,8 @@ Ox.Editable = function(options, self) {
that.$tooltip && that.$tooltip.options({title: ''});
that.triggerEvent('edit');
}
} else if (!self.options.editable) {
that.triggerEvent('open');
}
self.options.blurred = false;
}

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

@ -233,6 +233,9 @@ Ox.AnnotationFolder = function(options, self) {
insert: function(data) {
that.triggerEvent('insert', data);
},
open: function() {
that.triggerEvent('open');
},
select: selectAnnotation,
selectafter: function() {
that.triggerEvent('selectafter');

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

@ -88,6 +88,9 @@ Ox.AnnotationPanel = function(options, self) {
that.triggerEvent('info', {layer: layer.id});
},
insert: insert,
open: function() {
that.triggerEvent('open');
},
remove: function(data) {
that.triggerEvent('remove', Ox.extend({layer: layer.id}, data));
},

3
source/Ox.UI/js/Video/Ox.VideoEditor.js
View file

@ -648,6 +648,9 @@ Ox.VideoEditor = function(options, self) {
info: function(data) {
that.triggerEvent('info', data);
},
open: function() {
setPosition(self.options['in']);
},
remove: removeAnnotation,
resize: resizeAnnotations,
resizeend: resizeendAnnotations,

3
source/Ox.UI/js/Video/Ox.VideoPanel.js
View file

@ -209,6 +209,9 @@ Ox.VideoPanel = function(options, self) {
self.options.annotationsSort = data.sort;
that.triggerEvent('annotationssort', data);
},
open: function() {
setPosition(self.options['in']);
},
resize: resizeAnnotations,
resizeend: resizeendAnnotations,
resizecalendar: function(data) {