1 files changed, 35 insertions, 32 deletions

diff --git a/www/js/views/photo.js b/www/js/views/photo.js
index 485b74c..0b0c5e9 100644
--- a/www/js/views/photo.js
+++ b/www/js/views/photo.js
@@ -14,17 +14,23 @@
                 'vclick .ui-btn-right': 'onClickButtonNext',
                 'vclick #id_photo_button': 'takePhoto',
                 'vclick #id_existing': 'addPhoto',
-                'vclick #id_del_photo_button': 'deletePhoto'
+                'vclick .del_photo_button': 'deletePhoto'
             },
 
             beforeDisplay: function() {
                 this.fixPageHeight();
-                this.$('#id_del_photo_button').hide();
-                if ( this.model.get('file') ) {
-                    $('#id_photo_button').parents('.ui-btn').hide();
-                    $('#id_existing').parents('.ui-btn').hide();
-                    window.setTimeout( function() { $('#id_del_photo_button').show(); }, 250 );
-                }
+            },
+
+            afterDisplay: function() {
+                // The height of the photos container needs to be adjusted
+                // depending on the number of photos - if the max number of
+                // photos have already been added then the 'add photo' UI isn't
+                // shown so we should use all the vertical space for the
+                // thumbnails.
+                var wrapperHeight = $(".ui-content").height();
+                wrapperHeight -= $(".ui-content h2").outerHeight(true);
+                wrapperHeight -= $(".ui-content .bottom-btn").outerHeight(true)
+                $(".photo-wrapper").height(wrapperHeight);
             },
 
             getOptions: function(isFromAlbum) {
@@ -52,7 +58,7 @@
             takePhoto: function(e) {
                 e.preventDefault();
                 $.mobile.loading('show');
-                $('#photo').hide();
+                $('.photo-wrapper .photo img').hide();
                 var that = this;
 
                 var options = this.getOptions();
@@ -63,7 +69,7 @@
             addPhoto: function(e) {
                 e.preventDefault();
                 $.mobile.loading('show');
-                $('#photo').hide();
+                $('.photo-wrapper .photo img').hide();
                 var that = this;
                 var options = this.getOptions(true);
                 navigator.camera.getPicture( function(imgURI) { that.addPhotoSuccess(imgURI); }, function(error) { that.addPhotoFail(error); }, options);
@@ -86,25 +92,19 @@
 
                 var that = this;
                 move.done( function( file ) {
-                    $('#nophoto_title').hide();
-                    $('#photo_title').html(FMS.strings.photo_added).show();
-                    $('#photo').attr('src', file.toURL()).addClass('small').removeClass('placeholder');
-                    that.model.set('file', file.toURL());
+                    var files = that.model.get('files');
+                    files.push(file.toURL());
+                    that.model.set('files', files);
                     FMS.saveCurrentDraft();
-
-                    $('#photo-next-btn .ui-btn-text').text(FMS.strings.next);
-                    $('#id_photo_button').parents('.ui-btn').hide();
-                    $('#id_existing').parents('.ui-btn').hide();
-                    $('#photo').show();
-                    window.setTimeout(function() { $('#id_del_photo_button').show() }, 500);
-                    window.setTimeout(function() { $.mobile.loading('hide') }, 100);
+                    $.mobile.loading('hide');
+                    that.rerender();
                 });
 
                 move.fail( function() { that.addPhotoFail(); } );
             },
 
             addPhotoFail: function(message) {
-                $('#photo').show();
+                $('.photo-wrapper .photo img').show();
                 $.mobile.loading('hide');
                 if ( message != 'no image selected' &&
                     message != 'Selection cancelled.' &&
@@ -115,22 +115,25 @@
 
             deletePhoto: function(e) {
                 e.preventDefault();
-                var that = this;
-                var del = FMS.files.deleteURI( this.model.get('file') );
+                var files = this.model.get('files');
+                var index = parseInt($(e.target).data('fileIndex'));
+                var deleted_file = files.splice(index, 1)[0];
 
+                var del = FMS.files.deleteURI( deleted_file );
+
+                var that = this;
                 del.done( function() {
-                    $('#photo_title').hide();
-                    $('#nophoto_title').show();
-                    $('#id_del_photo_button').hide();
-                    that.model.set('file', '');
+                    that.model.set('files', files);
                     FMS.saveCurrentDraft(true);
-                    $('#photo').attr('src', 'images/placeholder-photo.png').addClass('placeholder').removeClass('small');
-
-                    $('#photo-next-btn .ui-btn-text').text(FMS.strings.skip);
-                    $('#id_photo_button').parents('.ui-btn').show();
-                    $('#id_existing').parents('.ui-btn').show();
+                    that.rerender();
                 });
+            },
 
+            rerender: function() {
+                // Simply calling this.render() breaks the DOM in a weird and
+                // interesting way, so this is a convenience wrapper around
+                // the correct router call.
+                FMS.router.photo();
             }
         })
     });