From: Charles Holbrow <charlesholbrow@gmail.com>
Date: Thu, 21 Mar 2013 19:28:30 +0000 (-0400)
Subject: Merge branch 'master' of github.com:FinalsClub/karmaworld
X-Git-Tag: release-20150131~479
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=7dc21759777e412456944d7d698903451bd6f409;p=oweals%2Fkarmaworld.git

Merge branch 'master' of github.com:FinalsClub/karmaworld
---

7dc21759777e412456944d7d698903451bd6f409
diff --cc karmaworld/assets/js/lightboxupload.js
index 9d4e183,58afa1e..5f012d4
--- a/karmaworld/assets/js/lightboxupload.js
+++ b/karmaworld/assets/js/lightboxupload.js
@@@ -39,15 -26,11 +39,16 @@@ $(function()
        element: $('#file-uploader')[0],
        multiple: false,
  
 +      onSubmit: function (id, fileName) {
 +        $('#file-uploader').hide();
 +        $('div.upload-status').show();
 +      },
 +
        onComplete: function( id, fileName, responseJSON ) {
          if( responseJSON.success ) {
+           console.log("responseJSON.note_url " + responseJSON.note_url);
            // activate the form for submitting
-           $('form#upload_form').attr('action', responseJSON.note_url);
+           $('form#add-note').attr('action', responseJSON.note_url);
            // inform the user of success
            $('#add-note-status').text('Uploaded');
            // TODO: activate the save button