From 2e71c71a28d8de043c4a5b8638161c8ed3a021c8 Mon Sep 17 00:00:00 2001
From: Rouven Hurling <rouven@rhurling.de>
Date: Tue, 5 May 2015 19:40:55 +0200
Subject: [PATCH] add confirmation modal and reload of albums after merge

---
 dist/main.js         | Bin 173588 -> 173863 bytes
 src/scripts/album.js |  40 +++++++++++++++++++++++++++++++++++-----
 2 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/dist/main.js b/dist/main.js
index 1ed8569c90aae1086cd0fe8c2bccc2af328b7d0e..7d42100b28b8ac23e018337b5e55ceb554543c3e 100644
GIT binary patch
delta 991
zcmYjPQEMDk6z1HtS-W=KXp&9WY&M%oTxXieq)GRo-E|w2CZW;ZlHfus%i3;tZ@L>M
zGsDbHVo6ezO8WyQazRT|l~^dWL<XEfDfL0<gVG`>KGcVzpv6!zXc1AwGbvbKzB}hT
z-#OphZ)WAo@Z~$<^{GgN%1q_TqRsf6ZMc`V#atda1O@MAWDJ114bcqZzGy#UE!vB?
z5<GjKM`HvE?!9OCqqg<AcToG$d(D8w`z;r{QIOr&ft+`2|CLaJYBtl$ygtv0thlG7
z@zWM7sZPGUv_#$H@Lk;c%WxlJVq^qoj*q+)j9xgn1`Sj#c%x&hjf65WyaqA%uU9QJ
z(GT|r_7{$5SbT9Luy-dXml5ww?nbnxVs3P*_i3t4*Nv(+F{(c4%;WB#raA+Q&}(PH
zs6JOxuvjl$#rJpLIQ|J@(}{yk1(_?k$HAnGWtDoB6ODn<Oc^b_cgqpdK$+rh8Zqxi
z<<a&i)hvh2RZXYJO2N%;)n`z*d*;tzs7D{fwMTUmsoVNc10Esk9(gjP8N8OK?xuYR
z)mcYFtUEoe!3}iIY$yNUdc4br4#$2QzlCeQ<vj$8zvmN(@r5qL+`{?f|3bI(&g0CL
zoKl~bWgUI)FUUB%<IRmA_eX0IDKPhgv0dK4$1N{orsF?;6MW3XgGSu#b^qKH#Fg3j
zIv{sEBw;*u{&7+QD$F=60`)iIa2BP$nSeORG%p!u#WXlGxRl+yCzH?T+0YitXU%GT
zy3VRnR;FUT1JV(y%4}(=iz?|fQa^OSV1g>WlBDWG)A;K+rasS()_F~~)M7=YVju}^
z=sb~xDmq?E!d;A0oRQ#ml=9+0DV^4fgC(@2qR<U}%}DOWFCt4d&aJEzH2jrrxW28O
zDvKCMmppjjw4(5uZ7!r}&XD^CRO+9Sp?y0P{Ih)!WZ}Qw4_9O87aE5L$H;O{biP1Z
zMd%#lMDr@N3#o_f63>j2wx=9TH_KI75uas9r>LHX`17;OKE+aHT~9eoXBEz>Se%@j
zb%w<Kw@5NVxBA0dlq4R?B)wA_HH{Z}YHLz-y-nKvS5{%70AcaZCL9o7{RZFp*M5gz
V7a{Clw8$8U?=6z})Fv&Ne*uxvMOXj;

delta 916
zcmYjPT}TvB6y}WP($=<`x+Se!&dM^Av*S-b)NZ3?DoJf9U8q>L+T3e9GR<r|S1r_D
zih7PQhJL6lDhLc?9;S$hAn2jcm!gMy2%;a7q9}=|ht3pKFW;SW&Uemt&v)nAjDO;>
zf4VOaAOe+`I9jA^sHj^POG6e5Y=)F`H_!z@tdd|W;@V&%Vm{b_IN^Oe4}u{MQr7c|
zb;zw=dJMUj&r|{iXRFRfk&swhi#ccKy6e6$k&9HzGIf}yX}T#Rv%>|NkxV5!Hb$(-
z##x;Dabp}Y+|hwOdpg#8t>-pfff6F6oX)NbWhI0v*5v7G>&KP?ifCIKJ^6FnWDFi{
z^W?4G-f_g4-qnbOzK|8{Ygk0&0aee*J)P3O$}rA;+qcq_@NGZhNA~fIh{1Gb3h!_2
z-g6VNeD9|6l)%K~A7fVO;}UWD_m+7=gISbtPGtie-b%DS>mlb(|NMd=kqagr${A*w
zX1vYrse{N{J^0;gs@Ga@><-Pq)I+Vk1P@=~Irpzg)>&R5*5~48WG74+Q8nwUy$v)*
zi>C5-JnnMIWLRIu?%|kcte(T*=WrOYW~2@=IdUTMpXo)#{NuTp6x9Ji&`{^)h=9Ed
z56yYL&tKuW6tyP1mOIT?t2Usg-EW?Hj~RYfhO?dM`*P2&*10EMa^VNgkH_L~`*<L>
zQ3Inu+_@S!id5GKLk$Q-;dP_m&>7VkpIFn>swfI=|D9zAjGQ{4(j1=<h&^2ku>g?-
zIyP2E#8?bduWF$sOvDDBm$dc){B=x28>Tx{mKO?Ax?du8a|D*5a!&+usCXj+vuLM%
zgolSg!qUx|SWHW|WKfdWBnt6LOs>Hf5%@e~g#_;v+=(dMDqTUuQ8c7ZXlXkviY#9=
zMplueF2tK9;_eq<#R5pVN8{jm;qGdLsSxV<y5Zf<%B;3;=s-`WnV|BZq3VJ-p0t}T
zfMoYdTvaKPsOavx2q|J$e1SIm^;dWSe)s-7d>XZv#KGs@KFGBJ`0bNXF6>sCTvh8Y
D`ot}-

diff --git a/src/scripts/album.js b/src/scripts/album.js
index cf0967c..cf98d34 100644
--- a/src/scripts/album.js
+++ b/src/scripts/album.js
@@ -570,11 +570,41 @@ album.getArchive = function(albumID) {
 }
 
 album.merge = function(albumIDs) {
-    var params = {
-        albumIDs: albumIDs.join()
+    var action = {}
+
+    action.fn = function() {
+
+        var params;
+
+        basicModal.close();
+
+        params = {
+            albumIDs: albumIDs.join()
+        }
+
+        api.post('Album::merge', params, function(data) {
+            if (data!==true) {
+                lychee.error(null, params, data);
+            } else {
+                albums.json = null
+                albums.load()
+            }
+        })
+
     }
 
-    api.post('Album::merge', params, function(data) {
-        if (data!==true) lychee.error(null, params, data);
-    })
+    basicModal.show({
+        body: '<p>Are you sure you want to merge all selected albums?</p>',
+        buttons: {
+            action: {
+                title: 'Merge Albums',
+                fn: action.fn,
+                class: 'red'
+            },
+            cancel: {
+                title: "Don't merge",
+                fn: basicModal.close
+            }
+        }
+    });
 }
\ No newline at end of file