sanj/oxjs
1
0
Fork 0
forked from 0x2620/oxjs
Code Pull requests Activity

fix ClipPanel merge conficts

Browse source
This commit is contained in:
j 2013-07-14 11:39:20 +00:00
commit d61f8e38d3
3 changed files with 44 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -117,7 +117,7 @@ Ox.AnnotationPanel = function(options, self) {
self.options.editable && renderEditMenu();
that.setElement(
Ox.SplitPanel({
self.$panel = Ox.SplitPanel({
elements: [
{
element: self.$menubar,