From 04eff288dd169c62eece5373998fb4b37815ae1e Mon Sep 17 00:00:00 2001
From: rolux <rolux@rollux.org>
Date: Fri, 9 Aug 2013 12:53:36 +0000
Subject: [PATCH] history: add split and join

---
 static/js/utils.js | 28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/static/js/utils.js b/static/js/utils.js
index e3a50d0fb..d60fe4521 100644
--- a/static/js/utils.js
+++ b/static/js/utils.js
@@ -297,25 +297,33 @@ pandora.createLinks = function($element) {
             removeItems(items, targets[0], function() {
                 addItems(items, targets[1], addToHistory);
             });
+        } else if (action == 'split' || action == 'join') {
+            removeItems(items[0], targets[0], function() {
+                addItems(items[1], targets[0], addToHistory);
+            });
         }
         function addToHistory(result, addedItems) {
             var actions = {
                     copy: 'Copying',
                     cut: 'Cutting',
                     'delete': 'Deleting',
+                    join: 'Joining',
                     move: 'Moving',
-                    paste: 'Pasting'
+                    paste: 'Pasting',
+                    split: 'Splitting'
                 },
+                length = action == 'join' || action == 'split' ? items[0].length : items.length,
                 type = getType(items),
                 text = Ox._(actions[action]) + ' ' + (
-                    items.length == 1 ? Ox._(type == 'item' ? pandora.site.itemName.singular : 'Clip')
-                    : items.length + ' ' + Ox._(type == 'item' ? pandora.site.itemName.plural : 'Clips')
+                    length == 1 ? Ox._(type == 'item' ? pandora.site.itemName.singular : 'Clip')
+                    : length + ' ' + Ox._(type == 'item' ? pandora.site.itemName.plural : 'Clips')
                 );
             pandora.history.add({
                 action: action,
                 items: action == 'cut' || action == 'delete' ? [items]
                     : action == 'copy' || action == 'paste' ? [addedItems]
-                    : [items, addedItems],
+                    : action == 'move' ? [items, addedItems]
+                    : [items],
                 positions: [],
                 targets: targets,
                 text: text
@@ -383,7 +391,9 @@ pandora.createLinks = function($element) {
                 }
             });
         } else {
-            pandora.api.addClips({clips: getClipData(items), edit: target, index: 0}, callback);
+            pandora.api.addClips({clips: getClipData(items), edit: target, index: 0}, function(result) {
+                callback(result, getClipItems(result.data.clips));
+            });
         }
     }
 
@@ -440,6 +450,14 @@ pandora.createLinks = function($element) {
         });
     }
 
+    function getClipItems(clips) {
+        return clips.map(function(clip) {
+            return (
+                clip.annotation || clip.item + '/' + clip['in'] + '-' + clip.out
+            ) + '/' + (clip.id || '');
+        });
+    }
+
     function getType(items) {
         return items[0] && Ox.contains(items[0], '/') ? 'clip' : 'item';
     }