merging changes
This commit is contained in:
commit
6bc75c8627
69 changed files with 1406 additions and 315 deletions
|
|
@ -1,4 +1,19 @@
|
|||
// vim: et:ts=4:sw=4:sts=4:ft=js
|
||||
|
||||
/*@
|
||||
Ox.AnnotationPanel <f:Ox.Element> AnnotationPanel Object
|
||||
() -> <f> AnnotationPanel Object
|
||||
(options) -> <f> AnnotationPanel Object
|
||||
(options, self) -> <f> AnnotationPanel Object
|
||||
options <o> Options object
|
||||
id <s> id
|
||||
items <a|[]> items
|
||||
titles <s> title
|
||||
type <s|text> panel type
|
||||
width <n|0>
|
||||
self <o> shared private variable
|
||||
@*/
|
||||
|
||||
Ox.AnnotationPanel = function(options, self) {
|
||||
|
||||
var self = self || {},
|
||||
|
|
@ -99,6 +114,9 @@ Ox.AnnotationPanel = function(options, self) {
|
|||
|
||||
}
|
||||
|
||||
/*@
|
||||
addItem <f> addItem
|
||||
@*/
|
||||
that.addItem = function(item) {
|
||||
var pos = 0;
|
||||
self.options.items.splice(pos, 0, item);
|
||||
|
|
@ -106,9 +124,16 @@ Ox.AnnotationPanel = function(options, self) {
|
|||
self.$annotations.editItem(pos);
|
||||
}
|
||||
|
||||
/*@
|
||||
removeItems <f> removeItems
|
||||
@*/
|
||||
that.removeItems = function(ids) {
|
||||
self.$annotations.removeItems(ids);
|
||||
}
|
||||
|
||||
/*@
|
||||
deselectItems <f> deselectItems
|
||||
@*/
|
||||
that.deselectItems = function() {
|
||||
if(self.$annotations.options('selected'))
|
||||
self.$annotations.options('selected',[]);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,14 @@
|
|||
// vim: et:ts=4:sw=4:sts=4:ft=js
|
||||
|
||||
/*@
|
||||
Ox.BlockTimeline <f:Ox.Element> BlockTimeline Object
|
||||
() -> <f> BlockTimeline Object
|
||||
(options) -> <f> BlockTimeline Object
|
||||
(options, self) -> <f> BlockTimeline Object
|
||||
options <o> Options object
|
||||
self <o> shared private variable
|
||||
@*/
|
||||
|
||||
Ox.BlockTimeline = function(options, self) {
|
||||
|
||||
var self = self || {},
|
||||
|
|
|
|||
|
|
@ -1,4 +1,14 @@
|
|||
// vim: et:ts=4:sw=4:sts=4:ft=js
|
||||
|
||||
/*@
|
||||
Ox.LargeTimeline <f:Ox.Element> LargeTimeline Object
|
||||
() -> <f> LargeTimeline Object
|
||||
(options) -> <f> LargeTimeline Object
|
||||
(options, self) -> <f> LargeTimeline Object
|
||||
options <o> Options object
|
||||
self <o> shared private variable
|
||||
@*/
|
||||
|
||||
Ox.LargeTimeline = function(options, self) {
|
||||
|
||||
var self = self || {},
|
||||
|
|
|
|||
|
|
@ -1,4 +1,14 @@
|
|||
// vim: et:ts=4:sw=4:sts=4:ft=js
|
||||
|
||||
/*@
|
||||
Ox.SmallTimeline <f:Ox.Element> SmallTimeline Object
|
||||
() -> <f> SmallTimeline Object
|
||||
(options) -> <f> SmallTimeline Object
|
||||
(options, self) -> <f> SmallTimeline Object
|
||||
options <o> Options object
|
||||
self <o> shared private variable
|
||||
@*/
|
||||
|
||||
Ox.SmallTimeline = function(options, self) {
|
||||
|
||||
var self = self || {},
|
||||
|
|
|
|||
|
|
@ -1,4 +1,14 @@
|
|||
// vim: et:ts=4:sw=4:sts=4:ft=js
|
||||
|
||||
/*@
|
||||
Ox.VideoEditor <f:Ox.Element> VideoEditor Object
|
||||
() -> <f> VideoEditor Object
|
||||
(options) -> <f> VideoEditor Object
|
||||
(options, self) -> <f> VideoEditor Object
|
||||
options <o> Options object
|
||||
self <o> shared private variable
|
||||
@*/
|
||||
|
||||
Ox.VideoEditor = function(options, self) {
|
||||
|
||||
var self = self || {},
|
||||
|
|
|
|||
|
|
@ -1,5 +1,14 @@
|
|||
// vim: et:ts=4:sw=4:sts=4:ft=js
|
||||
|
||||
/*@
|
||||
Ox.VideoEditorPlayer <f:Ox.Element> VideoEditorPlayer Object
|
||||
() -> <f> VideoEditorPlayer Object
|
||||
(options) -> <f> VideoEditorPlayer Object
|
||||
(options, self) -> <f> VideoEditorPlayer Object
|
||||
options <o> Options object
|
||||
self <o> shared private variable
|
||||
@*/
|
||||
|
||||
Ox.VideoEditorPlayer = function(options, self) {
|
||||
|
||||
var self = self || {},
|
||||
|
|
|
|||
|
|
@ -1,4 +1,14 @@
|
|||
// vim: et:ts=4:sw=4:sts=4:ft=js
|
||||
|
||||
/*@
|
||||
Ox.VideoPanelPlayer <f:Ox.Element> VideoPanelPlayer Object
|
||||
() -> <f> VideoPanelPlayer Object
|
||||
(options) -> <f> VideoPanelPlayer Object
|
||||
(options, self) -> <f> VideoPanelPlayer Object
|
||||
options <o> Options object
|
||||
self <o> shared private variable
|
||||
@*/
|
||||
|
||||
Ox.VideoPanelPlayer = function(options, self) {
|
||||
|
||||
var self = self || {},
|
||||
|
|
|
|||
|
|
@ -1,3 +1,5 @@
|
|||
// vim: et:ts=4:sw=4:sts=4:ft=js
|
||||
|
||||
/*@
|
||||
Ox.VideoPlayer <f> Generic Video Player
|
||||
(options, self) -> <o> Video Player
|
||||
|
|
@ -1417,4 +1419,4 @@ Ox.VideoPlayer = function(options, self) {
|
|||
|
||||
return that;
|
||||
|
||||
};
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue