From c72af378a77e8a1362fe90b4c99cf905f625241c Mon Sep 17 00:00:00 2001
From: rolux <rolux@rollux.org>
Date: Sat, 10 Aug 2013 11:12:09 +0000
Subject: [PATCH] edit panel: handle join

---
 static/js/editPanel.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/static/js/editPanel.js b/static/js/editPanel.js
index efd0a192b..9ff55ff70 100644
--- a/static/js/editPanel.js
+++ b/static/js/editPanel.js
@@ -177,7 +177,12 @@ pandora.ui.editPanel = function() {
                 });
             },
             join: function(data) {
-                Ox.print('JOIN', data);
+                var clips = [serializeClips(data.ids), serializeClips(data.join)];
+                pandora.doHistory('join', clips, ui.edit, function(result) {
+                    updateClips(edit.clips.filter(function(clip) {
+                        return !Ox.contains(data.ids, clip.id);
+                    }).concat(result.data.clips));
+                });
             },
             loop: function(data) {
                 pandora.UI.set({videoLoop: data.loop});