fix ClipPanel merge conficts

source/Ox.UI/js/Video/AnnotationPanel.js

@@ -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,

source/Ox.UI/js/Video/ClipPanel.js

@@ -56,8 +56,9 @@ Ox.ClipPanel = function(options, self) {
         .bindEvent({
             change: function(data) {
                 if (data.id == 'view') {
-                    that.replaceElement(1, self.$list = getList());
+                    self.options.view = data.checked[0].id;
-                    that.triggerEvent('view', {view: data.checked[0].id});
+                    self.$panel.replaceElement(1, self.$list = getList());
+                    self.$panel.triggerEvent('view', {view: self.options.view});
                 }
             },
             click: function(data) {
@@ -114,7 +115,7 @@ Ox.ClipPanel = function(options, self) {
     });
 
     that.setElement(
-        Ox.SplitPanel({
+        self.$panel = Ox.SplitPanel({
             elements: [
                 {
                     element: self.$menubar,
@@ -224,13 +225,9 @@ Ox.ClipPanel = function(options, self) {
             sort: self.options.sort,
             sortable: isSortable(),
             unique: 'id'
-        });
+        }) : Ox.Element();
-    } else {
-        self.$list = Ox.IconList({
 
-        });
+        $list.bindEvent({
-    }
-    self.$list.bindEvent({
             copy: function(data) {
                 that.triggerEvent('copy', data);
             },
@@ -266,48 +263,7 @@ Ox.ClipPanel = function(options, self) {
                 that.triggerEvent('edit', data);
             }
         });
-
+        return $list;
-    self.$statusbar = Ox.Bar({
-        size: 16
-    });
-
-    that.setElement(
-        Ox.SplitPanel({
-            elements: [
-                {
-                    element: self.$menubar,
-                    size: 24
-                },
-                {
-                    element: self.$list
-                },
-                {
-                    element: self.$statusbar,
-                    size: 16
-                }
-            ],
-            orientation: 'vertical'
-        })
-    );
-
-    function cutClips() {
-        
-    }
-
-    function editClip(data) {
-        var value = self.$list.value(data.id, data.key);
-        if (data.value != value && !(data.value === '' && value === null)) {
-            self.$list.value(data.id, data.key, data.value || null);
-            that.triggerEvent('edit', data);
-        }
-    }
-
-    function getButtonTitle() {
-        return self.options.sort[0].operator == '+' ? 'up' : 'down';
-    }
-
-    function getButtonTooltip() {
-        return Ox._(self.options.sort[0].operator == '+' ? 'Ascending' : 'Descending');
     }
 
     function isEditable(data) {

source/Ox.UI/js/Video/VideoPanel.js

@@ -335,7 +335,7 @@ Ox.VideoPanel = function(options, self) {
     });    
 
     that.setElement(
-        Ox.SplitPanel({
+        self.$panel = Ox.SplitPanel({
             elements: [
                 {
                     element: self.$videoPanel