tb_photos 1.0.4 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ae0e6a31cb45e6caa79125487e2ae8ac6c8ef670
-  data.tar.gz: b28cb9982545758d4450e626bc29db55e0fea247
+SHA256:
+  metadata.gz: 6312c612b6dea2c5a897ea003594296012b7068b4e988c60e01222f1677884c7
+  data.tar.gz: acefd2270d72b9f3973367277b05f065cea62aec278ad4f54a09755234957938
 SHA512:
-  metadata.gz: 309fdd963c7f4db518ef446f4061366880702c3956377bb30ade294e979030ae4cfe558fcd6cb0ea5d1e6ce7f2871eccb169825c907e68ebb631dcd60258d8a6
-  data.tar.gz: b0ab591e05cd3a54f5bb7318a812909d6298136e33a758e39405358058d6c2f5fa202a01bd99ad859cef60cc5c02fafefd1bf39786b109b84018ca815ee97f21
+  metadata.gz: b2494ec2f3d04bf6fd51c28fca5e396bac7f0a40b85c023b02464406cb05be5119dda330f40bd3d4aa31a953d8d012ef2aa45396f66eecad8e6305b321499b0f
+  data.tar.gz: 3a0852322e35fc2cd01ca74dc0d6882d4e57cdfed47a1bee26e66f96f59b0abf9bd41db090a2b815628256e074ab9486a951d78e2ac46d92c92d484b6cfc311b

data/Rakefile

@@ -20,7 +20,7 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
+APP_RAKEFILE = File.expand_path('../spec/dummy/Rakefile', __FILE__)
 load 'rails/tasks/engine.rake'
 
 Bundler::GemHelper.install_tasks

data/app/assets/javascripts/admin/photos/photos.js

@@ -1,418 +1,432 @@
 (function(){
 
-  spud.admin.photos = {};
-  var self = spud.admin.photos;
+var html5upload = false;
 
-  self.html5upload = false;
-
-  self.init = function(){
+var self = tb.photos = {
+  init: function(){
     // event handlers
-    $('.spud_admin_photo_ui_thumbs_sortable').sortable({
-      connectWith:'.spud_admin_photo_ui_thumbs_sortable'
-    });
-    $('body').on('submit', '#spud_admin_photo_album_form', self.submittedPhotoAlbumForm);
-    $('body').on('submit', '#spud_admin_photo_gallery_form', self.submittedPhotoGalleryForm);
-    $('body').on('submit', '#spud_admin_photo_form', self.submittedPhotoForm);
-    $('body').on('click', '.spud_admin_photos_btn_remove', self.clickedPhotoRemoveFromAlbum);
-    $('body').on('click', '.spud_admin_photo_ui_thumbs_selectable .spud_admin_photo_ui_thumb', self.selectedPhotoUiThumb);
-    $('body').on('click', '#spud_admin_photo_album_action_library', self.clickedPhotoLibrary);
-    $('body').on('click', '#spud_admin_photo_album_action_upload, .spud_admin_photo .spud_admin_photos_btn_edit', self.clickedPhotoAddOrEdit);
-    $('body').on('click', '.spud_admin_photo_library_add_selected', self.addSelectedPhotosFromLibrary);
-    $('body').on('click', '.spud_admin_photo_library_delete_selected', self.deleteSelectedPhotosFromLibrary);
+    Sortable.create(document.querySelector('#admin-photos-selected'));
+    $('body').on('submit', '#admin-photo-album-form', submittedPhotoAlbumForm);
+    $('body').on('submit', '#admin-photo-gallery-form', submittedPhotoGalleryForm);
+    $('body').on('submit', '#admin-photo-form', submittedPhotoForm);
+    $('body').on('click', '.admin-photos-btn-remove', clickedPhotoRemoveFromAlbum);
+    $('body').on('click', '.admin-photo-ui-thumbs-selectable .admin-photo-ui-thumb', selectedPhotoUiThumb);
+    $('body').on('click', '#admin-photo-album-action-library', clickedPhotoLibrary);
+    $('body').on('click', '#admin-photo-album-action-upload, .admin-photo .admin-photos-btn-edit', clickedPhotoAddOrEdit);
+    $('body').on('click', '.admin-photo-library-add-selected', addSelectedPhotosFromLibrary);
+    $('body').on('click', '.admin-photo-library-delete-selected', deleteSelectedPhotosFromLibrary);
+    $('#admin-photo-gallery-form').on('click', '.admin-photos-btn-delete', clickedDeleteAlbumFromGallery);
 
     // html5 drag and drop file
-    if(typeof(FormData) != 'undefined' && typeof(XMLHttpRequest) != 'undefined' && (droparea = document.getElementById('spud_admin_photo_upload_queue'))){
-      self.html5upload = true;
-      $('#spud_admin_photo_upload_queue').show();
-      droparea.addEventListener('dragenter', self.stopDndPropagation, false);
-      droparea.addEventListener('dragexit', self.stopDndPropagation, false);
-      droparea.addEventListener('dragover', self.stopDndPropagation, false);
-      droparea.addEventListener('drop', self.droppedFile, false);
+    if(typeof(FormData) != 'undefined' && typeof(XMLHttpRequest) != 'undefined' && (droparea = document.getElementById('admin-photo-upload-queue'))){
+      html5upload = true;
+      $('#admin-photo-upload-queue').show();
+      droparea.addEventListener('dragenter', stopDndPropagation, false);
+      droparea.addEventListener('dragexit', stopDndPropagation, false);
+      droparea.addEventListener('dragover', stopDndPropagation, false);
+      droparea.addEventListener('drop', droppedFile, false);
 
       // prevent accidental drops outside the queue
       var body = document.getElementsByTagName("body")[0];
-      body.addEventListener('dragenter', self.stopDndPropagation, false);
-      body.addEventListener('dragexit', self.stopDndPropagation, false);
-      body.addEventListener('dragover', self.stopDndPropagation, false);
-      body.addEventListener('drop', self.stopDndPropagation, false);
+      body.addEventListener('dragenter', stopDndPropagation, false);
+      body.addEventListener('dragexit', stopDndPropagation, false);
+      body.addEventListener('dragover', stopDndPropagation, false);
+      body.addEventListener('drop', stopDndPropagation, false);
     }
-  };
-
-  self.submittedPhotoAlbumForm = function(e){
-
-  };
-
-  self.submittedPhotoGalleryForm = function(e){
-    $('#spud_admin_photo_albums_available .spud_admin_photo_ui_thumb').remove();
-  };
-
-  self.clickedPhotoRemoveFromAlbum = function(e){
-    $(this).parents('.spud_admin_photo_ui_thumb').fadeOut(200, function(){
-      $(this).remove();
-    });
-    return false;
-  };
-
-  self.validatePhoto = function(file) {
-    var errors = [];
+  },
 
-    if(file) {
-      var allowedTypes = ["image/jpeg", "image/png", "image/gif", "image/bmp"];
-      if(allowedTypes.indexOf(file.type) < 0) {
-        errors.push("Unsupported file format");
-      }
-      var maxAllowedSize = spud.admin.photos.max_image_upload_size_bytes;
-      if(maxAllowedSize && file.size > maxAllowedSize) {
-        errors.push("Your file size of " + self.getFileSizeHumanized(file.size) + " exceeded the maximum limit of " + spud.admin.photos.max_image_upload_size_humanized);
-      }
-    }
-    else {
-      errors.push("No file found");
-    }
-    return errors;
-  };
-
-  /* Handle file uploads passed via iframe (legacy support)
-  * -------------------------------------------------------- */
-
-  self.photoLegacyUploadErrors = function(html){
-    $('#spud_admin_photo_form').replaceWith(html);
-  };
-
-  self.photoLegacyUploadComplete = function(id, html){
-    var element = $('#spud_admin_photo_' + id);
-    if(element.length > 0){
-      element.replaceWith(html);
-    }
-    else{
-      var target = $('#spud_admin_photos_selected, #spud_admin_photos');
-      target.prepend(html);
-    }
-    hideModalDialog();
-  };
-
-  self.selectedPhotoUiThumb = function(e){
-    var thumb = $(this);
-    if(thumb.hasClass('spud_admin_photo_ui_thumb_selected')){
-      $(this).removeClass('spud_admin_photo_ui_thumb_selected');
-    }
-    else{
-      $(this).addClass('spud_admin_photo_ui_thumb_selected');
+  getFileSizeHumanized: function(bytes) {
+    var sizes = ['Bytes', 'KB', 'MB', 'GB', 'TB'];
+    if(bytes === 0){
+      return 'n/a';
     }
-  };
+    var i = parseInt(Math.floor(Math.log(bytes) / Math.log(1024)), 10);
+    return (bytes / Math.pow(1024, i)).toFixed(1) + ' ' + sizes[i];
+  },
 
-  self.markPhotoAsDeleted = function(photo_id){
-    var photo = $('#spud_admin_photo_' + photo_id);
+  /* Ajax Callbacks
+  -------------------*/
+  markPhotoAsDeleted: function(photo_id){
+    var photo = $('#admin-photo-' + photo_id);
     photo.fadeOut(200, function(){
       photo.remove();
     });
-  };
+  },
 
-  self.markPhotoAlbumAsDeleted = function(photo_album_id){
-    var photo_album = $('#spud_admin_photo_album_' + photo_album_id);
+  markPhotoAlbumAsDeleted: function(photo_album_id){
+    var photo_album = $('#admin-photo-album-' + photo_album_id);
     photo_album.fadeOut(200, function(){
       photo_album.remove();
     });
-  };
+  },
 
-  self.markPhotoGalleryAsDeleted = function(photo_gallery_id){
-    var photo_gallery = $('#spud_admin_photo_gallery_' + photo_gallery_id);
+  markPhotoGalleryAsDeleted: function(photo_gallery_id){
+    var photo_gallery = $('#admin-photo-gallery-' + photo_gallery_id);
     photo_gallery.fadeOut(200, function(){
       photo_gallery.remove();
     });
-  };
-
-  /*
-  * Single-Photo Form Upload
-  -------------------------------- */
+  },
 
-  self.generateFileUploadErrors = function(errors, opts) {
+  /* Handle file uploads passed via iframe (legacy support)
+  * -------------------------------------------------------- */
+  photoLegacyUploadErrors: function(html){
+    $('#admin-photo-form').replaceWith(html);
+  },
 
-    if(typeof errors == "string") {
-      errors = [errors];
+  photoLegacyUploadComplete: function(id, html){
+    var element = $('#admin-photo-' + id);
+    if(element.length > 0){
+      element.replaceWith(html);
     }
-    var totalErrors = errors.length;
-    var errorMsg = totalErrors + " errors prohibited you from saving:";
-    if(totalErrors == 1) {
-      errorMsg = "1 error prohibited you from saving:";
+    else{
+      var target = $('#admin-photos-selected, #admin-photos');
+      target.prepend(html);
     }
-    if(opts && opts.showAsDialog) {
-      alert(errorMsg + '\n\t' + errors.join('\n\t'));
-      return false;
+    tb.modal.hide();
+  }
+};
+
+var submittedPhotoAlbumForm = function(e){
+
+};
+
+var submittedPhotoGalleryForm = function(e){
+  $('.admin-photo-albums-available input').remove();
+};
+
+var clickedDeleteAlbumFromGallery = function(e){
+  e.preventDefault();
+  var thumb = $(this).parents('.admin-photo-ui-thumb');
+  thumb.remove();
+  $('.admin-photo-albums-available').append(thumb);
+};
+
+var clickedPhotoRemoveFromAlbum = function(e){
+  $(this).parents('.admin-photo-ui-thumb').fadeOut(200, function(){
+    $(this).remove();
+  });
+  return false;
+};
+
+var validatePhoto = function(file) {
+  var errors = [];
+  if(file) {
+    var allowedTypes = ["image/jpeg", "image/png", "image/gif", "image/bmp"];
+    if(allowedTypes.indexOf(file.type) < 0) {
+      errors.push("Unsupported file format");
     }
-
-    $(".spud_admin_form_error_list").remove();
-    $("#spud_admin_photo_form").find("[for=spud_photo_photo]").css("color","black");
-    $("#spud_admin_photo_form").before('<div class="spud_admin_form_error_list"><ul><h4>' + errorMsg +'</h4></ul></div>');
-    $("#spud_admin_photo_form").find("[for=spud_photo_photo]").css("color","red");
-    for(var i = 0; i < errors.length; i++) {
-      $(".spud_admin_form_error_list > ul").append("<li>"+ errors[i] + "</li>");
+    var maxAllowedSize = tb.photos.max_image_upload_size_bytes;
+    if(maxAllowedSize && file.size > maxAllowedSize) {
+      errors.push("Your file size of " + self.getFileSizeHumanized(file.size) + " exceeded the maximum limit of " + tb.photos.max_image_upload_size_humanized);
+    }
+  }
+  else{
+    if($('.admin-photo-form-current-photo').length === 0){
+      errors.push("No file found");
     }
+  }
+  return errors;
+};
+
+var selectedPhotoUiThumb = function(e){
+  var thumb = $(this);
+  if(thumb.hasClass('admin-photo-ui-thumb-selected')){
+    $(this).removeClass('admin-photo-ui-thumb-selected');
+  }
+  else{
+    $(this).addClass('admin-photo-ui-thumb-selected');
+  }
+};
+
+/*
+* Single-Photo Form Upload
+-------------------------------- */
+
+var generateFileUploadErrors = function(errors, opts) {
+
+  if(typeof errors == "string") {
+    errors = [errors];
+  }
+  var totalErrors = errors.length;
+  var errorMsg = totalErrors + " errors prohibited you from saving:";
+  if(totalErrors == 1) {
+    errorMsg = "1 error prohibited you from saving:";
+  }
+  if(opts && opts.showAsDialog) {
+    alert(errorMsg + '\n\t' + errors.join('\n\t'));
     return false;
-  };
-
-  self.getFileSizeHumanized = function(bytes) {
-    var sizes = ['Bytes', 'KB', 'MB', 'GB', 'TB'];
-    if(bytes === 0){
-      return 'n/a';
+  }
+
+  $(".form-errors").remove();
+  $("#admin-photo-form").find("[for=spud_photo_photo]").css("color","black");
+  $("#admin-photo-form").before('<div class="form-errors"><h4>' + errorMsg +'</h4><ul></ul></div>');
+  $("#admin-photo-form").find("[for=spud_photo_photo]").css("color","red");
+  for(var i = 0; i < errors.length; i++) {
+    $(".form-errors > ul").append("<li>"+ errors[i] + "</li>");
+  }
+  return false;
+};
+
+var submittedPhotoForm = function(e){
+  if(html5upload){
+    // create a FormData object and attach form values
+    var fd = new FormData();
+    var form = $(this);
+    fd.append('_method', form.find('[name=_method]').val());
+    fd.append('authenticity_token', form.find('[name=authenticity_token]').val());
+    fd.append('spud_photo[title]', form.find('#spud_photo_title').val());
+    fd.append('spud_photo[caption]', form.find('#spud_photo_caption').val());
+
+    // progress bar to send events to
+    var progressBar;
+    var file = form.find('#spud_photo_photo')[0].files[0];
+    var photoValidationErrors = validatePhoto(file);
+    if(photoValidationErrors.length) {
+      return generateFileUploadErrors(photoValidationErrors);
     }
-    var i = parseInt(Math.floor(Math.log(bytes) / Math.log(1024)), 10);
-    return (bytes / Math.pow(1024, i)).toFixed(1) + ' ' + sizes[i];
-  };
-
-  self.submittedPhotoForm = function(e){
-    // disable submit button
-    // not working in updated bootstrap!
-    // var submit = $(this).find('input[type=submit]');
-    // submit.attr('disabled', 'disabled').val(submit.attr('data-loading-text'));
-
-    if(self.html5upload){
-      // create a FormData object and attach form values
-      var fd = new FormData();
-      var form = $(this);
-      fd.append('_method', form.find('[name=_method]').val());
-      fd.append('authenticity_token', form.find('[name=authenticity_token]').val());
-      fd.append('spud_photo[title]', form.find('#spud_photo_title').val());
-      fd.append('spud_photo[caption]', form.find('#spud_photo_caption').val());
-
-      // progress bar to send events to
-      var progressBar;
-      var file = form.find('#spud_photo_photo')[0].files[0];
-      var photoValidationErrors = self.validatePhoto(file);
-      if(photoValidationErrors.length) {
-        return self.generateFileUploadErrors(photoValidationErrors);
-      }
-      
-      progressBar = self.progressBarForUpload(file.name);
+
+    if(file){
+      progressBar = progressBarForUpload(file.name);
       fd.append('spud_photo[photo]', file);
       form.append(progressBar);
-
-      // send FormData object as ajax request
-      var xhr = new XMLHttpRequest();
-      xhr.upload.addEventListener('progress', function(e){ self.onPhotoUploadProgress(e, progressBar); }, false);
-      xhr.addEventListener('load', function(e){ self.onPhotoUploadComplete(e, progressBar); }, false);
-      xhr.addEventListener('error', function(e){ self.onPhotoUploadFailure(e, progressBar); }, false);
-      xhr.addEventListener('abort', function(e){ self.onPhotoUploadCancel(e, progressBar); }, false);
-      xhr.open('POST', form.attr('action'));
-      xhr.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
-      xhr.send(fd);
-      return false;
-    }
-  };
-
-  /*
-  * Upload Progress Monitoring
-  -------------------------------- */
-
-  self.progressBarForUpload = function(fileName){
-    var html = [
-      '<div class="spud_admin_photo_progress">',
-        '<h6>',
-          '<span class="spud_admin_photo_progress_filename">'+fileName+'</span>: ',
-          '<span class="spud_admin_photo_progress_status">Uploading</span>',
-        '</h6>',
-        '<div class="progress progress-striped active">',
-          '<div class="bar" style="width: 0;"></div>',
-        '</div>',
-      '</div>'
-    ].join('');
-    return $(html);
-  };
-
-  self.onPhotoUploadProgress = function(e, progressBar){
-    var percent = Math.round(e.loaded * 100 / e.total);
-    progressBar.find('.bar').css({width: percent + '%'});
-    if(percent == 100){
-      progressBar.find('.progress').addClass('progress-success');
-      progressBar.find('.spud_admin_photo_progress_status').text('Processing');
-    }
-  };
-
-  self.onPhotoUploadComplete = function(e, progressBar){
-    // success
-    var photo = $.parseJSON(e.target.response);
-    if(e.target.status == 200){
-      progressBar.find('.spud_admin_photo_progress_status').text('Done!');
-      progressBar.find('.progress').removeClass('progress-striped active');
-      var element = $('#spud_admin_photo_' + photo.id);
-      if(element.length > 0){
-        element.replaceWith(photo.html);
-      }
-      else{
-        var target = $('#spud_admin_photos_selected, #spud_admin_photos');
-        target.prepend(photo.html).fadeIn(200);
-      }
-      hideModalDialog();
     }
-    // validation error
     else{
-      $("#modal_window .modal-body").html(photo.html);
+      progressBar = progressBarForUpload('');
     }
-  };
-
-  self.onPhotoUploadCancel = function(e, progressBar){
-    progressBar.find('.spud_admin_photo_progress_status').text('Done!');
-    progressBar.find('.progress').addClass('progress-danger');
-  };
-
-  /*
-  * Photo Upload/Edit Form
-  ------------------------------- */
-  self.clickedPhotoAddOrEdit = function(e){
-    var url = this.href;
-    $.ajax({
-      url:url,
-      success:self.photoUploadFormLoaded
-    });
-    return false;
-  };
 
-  self.photoUploadFormLoaded = function(html){
-    displayModalDialogWithOptions({
-      title: 'Upload Photo',
-      html: html
-    });
-    $("#fileUploadSizeLegend").html('File Upload <span class="split-pane-item-meta">max allowed size : '+ spud.admin.photos.max_image_upload_size_humanized +'</span>');
-  };
-
-  /*
-  * Add From Photo Library
-  ------------------------------- */
-
-  self.clickedPhotoLibrary = function(e){
-    var url = this.href;
-    $.ajax({
-      url:url,
-      success:self.photoLibraryLoaded
-    });
+    // send FormData object as ajax request
+    var xhr = new XMLHttpRequest();
+    xhr.upload.addEventListener('progress', function(e){ onPhotoUploadProgress(e, progressBar); }, false);
+    xhr.addEventListener('load', function(e){ onPhotoUploadComplete(e, progressBar); }, false);
+    xhr.addEventListener('error', function(e){ onPhotoUploadFailure(e, progressBar); }, false);
+    xhr.addEventListener('abort', function(e){ onPhotoUploadCancel(e, progressBar); }, false);
+    xhr.open('POST', form.attr('action'));
+    xhr.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
+    xhr.send(fd);
     return false;
-  };
-
-  self.photoLibraryLoaded = function(html){
-    var dialog = $('#modal_window');
-    $('#spud_admin_photos_selected .spud_admin_photo_ui_thumb').each(function(){
-      var id = $(this).attr('id');
-      var dupe = dialog.find('#'+id);
-      if(dupe){
-        dupe.remove();
-      }
-    });
-    displayModalDialogWithOptions({
-      title: 'My Photo Library',
-      html: html,
-      buttons:{
-        'spud_admin_photo_library_add_selected btn-primary': 'Add Selected',
-        'spud_admin_photo_library_delete_selected btn-danger': 'Delete Selected'
-      }
-    });
-  };
-
-  self.addSelectedPhotosFromLibrary = function(e){
-    $('#spud_admin_photo_library .spud_admin_photo_ui_thumb_selected')
-      .removeClass('spud_admin_photo_ui_thumb_selected')
-      .prependTo('#spud_admin_photos_selected')
-      .hide()
-      .fadeIn(200);
-    hideModalDialog();
-  };
-
-  self.deleteSelectedPhotosFromLibrary = function(e){
-    var ids = $.map($('.spud_admin_photo_ui_thumb_selected'), function(val, i){
-      return $(val).attr('rel');
-    });
-    $.ajax({
-      type: 'POST',
-      url: '/admin/photos/mass_destroy',
-      data: {spud_photo_ids:ids},
-      success: function(data, textStatus, jqXHR){
-        $('.spud_admin_photo_ui_thumb_selected').fadeOut(200, function(){
-          $(this).remove();
-        });
-      },
-      error: function(jqXHR, textStatus, errorThrown){
-        console.log('An error occurred:');
-        console.log(arguments);
-      }
-    });
-
-  };
-
-  /*
-  * Drag & Drop File Upload Queue
-  -------------------------------- */
-
-  self.fileQueue = [];
-  self.fileQueueStarted = false;
-
-  // prevent default browser behavior of opening the dropped file
-  self.stopDndPropagation = function(e){
-    e.stopPropagation();
-    e.preventDefault();
-  };
-
-  // add files to queue. starts queue if not started already
-  self.droppedFile = function(e){
-    e.stopPropagation();
-    e.preventDefault();
-    $('#spud_admin_photo_upload_queue').show();
-    var files = e.dataTransfer.files;
-    var i = 0;
-    while(i < files.length){
-      var file = files[i];
-      var photoValidationErrors = self.validatePhoto(file);
-      if(photoValidationErrors.length) {
-        return self.generateFileUploadErrors(photoValidationErrors, {showAsDialog: true});
-      }
-      self.fileQueue.push(file);
-      i++;
+  }
+};
+
+/*
+* Upload Progress Monitoring
+-------------------------------- */
+
+var progressBarForUpload = function(fileName){
+  var html = [
+    '<div class="admin-photo-progress">',
+      '<h6>',
+        '<span class="admin-photo-progress_filename">'+fileName+'</span>: ',
+        '<span class="admin-photo-progress_status">Uploading</span>',
+      '</h6>',
+      '<div class="progress">',
+        '<div class="progress-bar progress-bar-striped active" style="width: 0;"></div>',
+      '</div>',
+    '</div>'
+  ].join('');
+  return $(html);
+};
+
+var onPhotoUploadProgress = function(e, progressBar){
+  var percent = Math.round(e.loaded * 100 / e.total);
+  progressBar.find('.progress-bar').css({width: percent + '%'});
+  if(percent == 100){
+    progressBar.find('.admin-photo-progress_status').text('Processing');
+  }
+};
+
+var onPhotoUploadComplete = function(e, progressBar){
+  // success
+  var photo = $.parseJSON(e.target.response);
+  if(e.target.status == 200){
+    progressBar.find('.admin-photo-progress_status').text('Done!');
+    progressBar.find('.progress-bar').removeClass('progress-bar-striped active').addClass('progress-bar-success');
+    var element = $('#admin-photo-' + photo.id);
+    if(element.length > 0){
+      element.replaceWith(photo.html);
     }
-    self.updateQueueCountLabel();
-    if(!this.fileQueueStarted){
-      self.uploadNextPhoto();
-      if(self.fileQueue.length > 0){
-        self.uploadNextPhoto();
+    else{
+      var target = $('#admin-photos-selected, #admin-photos');
+      target.prepend(photo.html).fadeIn(200);
+    }
+    tb.modal.hide();
+  }
+  // validation error
+  else{
+    $("#modal_window .modal-body").html(photo.html);
+  }
+};
+
+var onPhotoUploadCancel = function(e, progressBar){
+  progressBar.find('.admin-photo-progress_status').text('Done!');
+  progressBar.find('.progress').addClass('progress-danger');
+};
+
+var onPhotoUploadFailure = function(e, progressBar){
+  if(typeof(console) == 'object'){
+    console.error('An unexpected error occurred during upload', e);
+  }
+};
+
+/*
+* Photo Upload/Edit Form
+------------------------------- */
+var clickedPhotoAddOrEdit = function(e){
+  var url = this.href;
+  $.ajax({
+    url:url,
+    success:photoUploadFormLoaded
+  });
+  return false;
+};
+
+var photoUploadFormLoaded = function(html){
+  tb.modal.displayWithOptions({
+    title: 'Upload Photo',
+    html: html
+  });
+  $(".admin-photo-form-max-size").text('Maximum upload size: '+ tb.photos.max_image_upload_size_humanized);
+};
+
+/*
+* Add From Photo Library
+------------------------------- */
+
+var clickedPhotoLibrary = function(e){
+  var url = this.href;
+  $.ajax({
+    url:url,
+    success:photoLibraryLoaded
+  });
+  return false;
+};
+
+var photoLibraryLoaded = function(html){
+  var dialog = $('#modal_window');
+  $('#admin-photos-selected .admin-photo-ui-thumb').each(function(){
+    var id = $(this).attr('id');
+    var dupe = dialog.find('#'+id);
+    if(dupe){
+      dupe.remove();
+    }
+  });
+  tb.modal.displayWithOptions({
+    title: 'My Photo Library',
+    html: html,
+    buttons:{
+      'admin-photo-library-add-selected btn-primary': 'Add Selected',
+      'admin-photo-library-delete-selected btn-danger': 'Delete Selected'
+    }
+  });
+};
+
+var addSelectedPhotosFromLibrary = function(e){
+  $('#admin-photo-library .admin-photo-ui-thumb-selected')
+    .removeClass('admin-photo-ui-thumb-selected')
+    .prependTo('#admin-photos-selected')
+    .hide()
+    .fadeIn(200);
+  tb.modal.hide();
+};
+
+var deleteSelectedPhotosFromLibrary = function(e){
+  var ids = $.map($('.admin-photo-ui-thumb-selected'), function(val, i){
+    return $(val).attr('rel');
+  });
+  $.ajax({
+    type: 'POST',
+    url: '/admin/photos/mass_destroy',
+    data: {spud_photo_ids:ids},
+    success: function(data, textStatus, jqXHR){
+      $('.admin-photo-ui-thumb-selected').fadeOut(200, function(){
+        $(this).remove();
+      });
+      for(var i=0; i<ids.length; i++){
+        tb.photos.markPhotoAsDeleted(ids[i]);
       }
+    },
+    error: function(jqXHR, textStatus, errorThrown){
+      console.log('An error occurred:');
+      console.log(arguments);
     }
-  };
-
-  self.updateQueueCountLabel = function(){
-    $('#spud_admin_photo_upload_queue_label span').text(self.fileQueue.length);
-  };
-
-  self.uploadNextPhoto = function(){
-    if(self.fileQueue.length === 0){
-      self.fileQueueStarted = false;
-      return;
+  });
+};
+
+/*
+* Drag & Drop File Upload Queue
+-------------------------------- */
+
+var fileQueue = [];
+var fileQueueStarted = false;
+
+// prevent default browser behavior of opening the dropped file
+var stopDndPropagation = function(e){
+  e.stopPropagation();
+  e.preventDefault();
+};
+
+// add files to queue. starts queue if not started already
+var droppedFile = function(e){
+  e.stopPropagation();
+  e.preventDefault();
+  $('#admin-photo-upload-queue').show();
+  var files = e.dataTransfer.files;
+  var i = 0;
+  while(i < files.length){
+    var file = files[i];
+    var photoValidationErrors = validatePhoto(file);
+    if(photoValidationErrors.length) {
+      return generateFileUploadErrors(photoValidationErrors, {showAsDialog: true});
     }
-
-    // formdata object
-    self.fileQueueStarted = true;
-    var file = self.fileQueue.pop();
-    var fd = new FormData();
-    fd.append('spud_photo[photo]', file);
-
-    var csrf = $('meta[name=csrf-token]').prop('content');
-    fd.append('authenticity_token', csrf);
-
-    // create a progress bar
-    var progressBar = self.progressBarForUpload(file.name);
-    $('#spud_admin_photo_upload_queue_bars').prepend(progressBar);
-
-    // send formdata as xhr
-    var xhr = new XMLHttpRequest();
-    xhr.upload.addEventListener('progress', function(e){ self.onPhotoUploadProgress(e, progressBar); }, false);
-    xhr.addEventListener('load', function(e){ self.onQueuedPhotoUploadComplete(e, progressBar); }, false);
-    xhr.addEventListener('error', function(e){ self.onPhotoUploadFailure(e, progressBar); }, false);
-    xhr.addEventListener('abort', function(e){ self.onPhotoUploadCancel(e, progressBar); }, false);
-    xhr.open('POST', '/admin/photos');
-    xhr.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
-    xhr.send(fd);
-  };
-
-  self.onQueuedPhotoUploadComplete = function(e, progressBar){
-    self.onPhotoUploadComplete(e, progressBar);
-    self.updateQueueCountLabel();
-    self.uploadNextPhoto();
-  };
+    fileQueue.push(file);
+    i++;
+  }
+  updateQueueCountLabel();
+  if(!this.fileQueueStarted){
+    uploadNextPhoto();
+    if(fileQueue.length > 0){
+      uploadNextPhoto();
+    }
+  }
+};
+
+var updateQueueCountLabel = function(){
+  $('#admin-photo-upload-queue_label span').text(fileQueue.length);
+};
+
+var uploadNextPhoto = function(){
+  if(fileQueue.length === 0){
+    fileQueueStarted = false;
+    return;
+  }
+
+  // formdata object
+  fileQueueStarted = true;
+  var file = fileQueue.pop();
+  var fd = new FormData();
+  fd.append('spud_photo[photo]', file);
+
+  var csrf = $('meta[name=csrf-token]').prop('content');
+  fd.append('authenticity_token', csrf);
+
+  // create a progress bar
+  var progressBar = progressBarForUpload(file.name);
+  $('#admin-photo-upload-queue_bars').prepend(progressBar);
+
+  // send formdata as xhr
+  var xhr = new XMLHttpRequest();
+  xhr.upload.addEventListener('progress', function(e){ onPhotoUploadProgress(e, progressBar); }, false);
+  xhr.addEventListener('load', function(e){ onQueuedPhotoUploadComplete(e, progressBar); }, false);
+  xhr.addEventListener('error', function(e){ onPhotoUploadFailure(e, progressBar); }, false);
+  xhr.addEventListener('abort', function(e){ onPhotoUploadCancel(e, progressBar); }, false);
+  xhr.open('POST', '/admin/photos');
+  xhr.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
+  xhr.send(fd);
+};
+
+var onQueuedPhotoUploadComplete = function(e, progressBar){
+  onPhotoUploadComplete(e, progressBar);
+  updateQueueCountLabel();
+  uploadNextPhoto();
+};
 
 })();