Merge branch 'master' of github.com:diaspora/diaspora

app/controllers/photos_controller.rb

@@ -2,6 +2,7 @@ class PhotosController < ApplicationController
   before_filter :authenticate_user!
   
   def create
+    render :nothing => true
     begin
       @photo = current_user.post(:photo, params)
 
@@ -21,6 +22,8 @@ class PhotosController < ApplicationController
   
   def new
     @photo = Photo.new
+    @album = current_user.album_by_id(params[:album_id])
+    render :partial => "new_photo"
   end
   
   def destroy

app/models/user.rb

@@ -46,6 +46,7 @@ class User
     options.delete(:group_id)
 
     model_class = class_name.to_s.camelize.constantize
+    
     post = model_class.instantiate(options)
     post.creator_signature = post.sign_with_key(encryption_key)
     post.save
@@ -324,6 +325,11 @@ class User
     groups.detect{|x| x.id == id }
   end
 
+  def album_by_id( id )
+    id = ensure_bson id
+    albums.detect{|x| x.id == id }
+  end
+
   def groups_with_person person
     id = ensure_bson person.id
     groups.select {|group| group.person_ids.include? id}

app/views/albums/show.html.haml

@@ -1,3 +1,9 @@
+:javascript
+  $(document).ready(function(){
+    reset_photo_fancybox();
+  });
+
+.album_id{:id => @album.id, :style => "display:hidden;"}
 .back= link_to '⇧ albums', albums_path
 %h1.big_text
 
@@ -11,7 +17,6 @@
 
   .yo{:style => "display:none;"}
     #new_photo_pane
-      = render "photos/new_photo", :photo => @photo, :album => @album
 
 .sub_header
   ="updated #{how_long_ago(@album)}"

app/views/js/_websocket_js.haml

@@ -1,103 +1,101 @@
--  if user_signed_in?
+= javascript_include_tag 'FABridge', 'swfobject', 'web_socket'
-  = javascript_include_tag 'FABridge', 'swfobject', 'web_socket'
+:javascript
-  :javascript
+  WebSocket.__swfLocation = "/javascripts/WebSocketMain.swf";
-      WebSocket.__swfLocation = "/javascripts/WebSocketMain.swf";
+  $(document).ready(function(){
-  :javascript
+    function debug(str){ $("#debug").append("<p>" +  str); };
-    $(document).ready(function(){
-      function debug(str){ $("#debug").append("<p>" +  str); };
 
-      ws = new WebSocket("ws://#{request.host}:8080/#{CGI::escape(current_user.id.to_s)}");
+    ws = new WebSocket("ws://#{request.host}:8080/#{CGI::escape(current_user.id.to_s)}");
 
-    //Attach onmessage to websocket
+  //Attach onmessage to websocket
-      ws.onmessage = function(evt) {
+    ws.onmessage = function(evt) {
-        var obj = jQuery.parseJSON(evt.data);
+      var obj = jQuery.parseJSON(evt.data);
-        debug("got a " + obj['class'] + " for group " + obj['group_id']);
+      debug("got a " + obj['class'] + " for group " + obj['group_id']);
 
-        if (obj['class']=="retractions"){
+      if (obj['class']=="retractions"){
-          processRetraction(obj['post_id']);
+        processRetraction(obj['post_id']);
       
-        }else if (obj['class']=="comments"){
+      }else if (obj['class']=="comments"){
-          processComment(obj['post_id'], obj['html']) 
+        processComment(obj['post_id'], obj['html']) 
       
-        }else if (obj['class']=='photos' && onPageForClass('albums')){
+      }else if (obj['class']=='photos' && onPageForClass('albums')){
-          processPhotoInAlbum(obj['photo_hash'])
+        processPhotoInAlbum(obj['photo_hash'])
-        }else if (obj['class']=='status_messages'){
+      }else if (obj['class']=='status_messages'){
-          processStatusMessage(obj['class'], obj['html'], obj['status_message_hash'], obj['group_id'], obj['mine?'])
+        processStatusMessage(obj['class'], obj['html'], obj['status_message_hash'], obj['group_id'], obj['mine?'])
-        }else{
+      }else{
-          processPost(obj['class'], obj['html'], obj['group_id'], obj['mine?'])
+        processPost(obj['class'], obj['html'], obj['group_id'], obj['mine?'])
-        }
-
-        
-      }; 
-      ws.onclose = function() { debug("socket closed"); };
-      ws.onopen = function() {
-        ws.send(location.pathname);
-        debug("connected...");
-      };
-
-      function processRetraction(post_id){
-        $('#' + post_id ).fadeOut(500, function(){
-          $(this).remove;
-        });
       }
 
-      function processComment(post_id, html){
+      
-        post = $('#' + post_id)[0]
+    }; 
-        $(' .comment_set li:last', post ).before(
+    ws.onclose = function() { debug("socket closed"); };
-          $(html).fadeIn("fast", function(){})
+    ws.onopen = function() {
+      ws.send(location.pathname);
+      debug("connected...");
+    };
+
+    function processRetraction(post_id){
+      $('#' + post_id ).fadeOut(500, function(){
+        $(this).remove;
+      });
+    }
+
+    function processComment(post_id, html){
+      post = $('#' + post_id)[0]
+      $(' .comment_set li:last', post ).before(
+        $(html).fadeIn("fast", function(){})
+      );
+      toggler = $('.show_post_comments', post)
+      toggler.html(
+        toggler.html().replace(/\d/,$('.comment_set', post)[0].childElementCount -1));
+    }
+
+    function processPost(className, html, groupId, mineBool){
+      if(mineBool || onPageForClass(className) || onPageForGroup(groupId)){
+        $("#stream").prepend(
+          $(html).fadeIn("fast", function(){
+            $("#stream label:first").inFieldLabels();
+          })
         ); 
-        toggler = $('.show_post_comments', post)
-        toggler.html(
-          toggler.html().replace(/\d/,$('.comment_set', post)[0].childElementCount -1));
       }
+    }
 
-      function processPost(className, html, groupId, mineBool){
+    function processStatusMessage(className, html, messageHash, groupId, mineBool){
-        if(mineBool || onPageForClass(className) || onPageForGroup(groupId)){
+      processPost(className, html, groupId, mineBool);
-          $("#stream").prepend(
+      console.log(messageHash)
-            $(html).fadeIn("fast", function(){
+      if(messageHash['mine?']){
-              $("#stream label:first").inFieldLabels();
+        updateMyLatestStatus(messageHash);
-            })
-          ); 
-        }
       }
+    }
     
-      function processStatusMessage(className, html, messageHash, groupId, mineBool){
+    function updateMyLatestStatus(messageHash){
-        processPost(className, html, groupId, mineBool);
+      $("#latest_message").text(messageHash['text']);
-        console.log(messageHash)
+      $("#latest_message_time").text(' - just now');
-        if(messageHash['mine?']){
+    }
-          updateMyLatestStatus(messageHash);
-        }
-      }
 
-      function updateMyLatestStatus(messageHash){
+    function processPhotoInAlbum(photoHash){
-        $("#latest_message").text(messageHash['text']);
+      if (location.href.indexOf(photoHash['album_id']) == -1){
-        $("#latest_message_time").text(' - just now');
+        return ;
       }
+      html =  "<div class=\'image_thumb\' id=\'"+photoHash['id']+"\' style=\'padding-right:3px;\'> \
+        <a href=\"/photos/"+ photoHash['id'] +"\"> \
+        <img alt=\"New thumbnail\" src=\""+ photoHash['thumb_url'] +"\" /> \
+        </a> </div>"  
+      $("#thumbnails").append( $(html) )
+      $("#"+ photoHash['id'] + "  img").load( function() {
+        $(this).fadeIn("slow");
+      });
+    }
     
-      function processPhotoInAlbum(photoHash){
+    function onPageForClass(className){
-        if (location.href.indexOf(photoHash['album_id']) == -1){
+      return ((location.href.indexOf(className) != -1 ) || (location.pathname == '/')) && onPageOne();
-          return ;
+    }
-        }
-        html =  "<div class=\'image_thumb\' id=\'"+photoHash['id']+"\' style=\'padding-right:3px;\'> \
-          <a href=\"/photos/"+ photoHash['id'] +"\"> \
-          <img alt=\"New thumbnail\" src=\""+ photoHash['thumb_url'] +"\" /> \
-          </a> </div>"  
-        $("#thumbnails").append( $(html) )
-        $("#"+ photoHash['id'] + "  img").load( function() {
-          $(this).fadeIn("slow");
-        });
-      }
 
-      function onPageForClass(className){
+    function onPageForGroup(groupId){
-        return ((location.href.indexOf(className) != -1 ) || (location.pathname == '/')) && onPageOne();
+      return (location.href.indexOf(groupId) != -1 ) 
-      }
+    }
     
-      function onPageForGroup(groupId){
+    function onPageOne() {
-        return (location.href.indexOf(groupId) != -1 ) 
+        var c = document.location.search.charAt(document.location.search.length-1);
-      }
+        return ((c =='') || (c== '1'));
-      
+    }
-      function onPageOne() {
+  });
-          var c = document.location.search.charAt(document.location.search.length-1);
-          return ((c =='') || (c== '1'));
-      }
-    });

app/views/layouts/application.html.haml

@@ -13,7 +13,6 @@
 
     /= javascript_include_tag "http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"
     = javascript_include_tag 'jquery142', 'rails', 'google'
-    = javascript_include_tag 'tiny_mce/tiny_mce'
     = javascript_include_tag 'jquery.infieldlabel', 'jquery.cycle/jquery.cycle.min.js'
     
     = javascript_include_tag 'fancybox/jquery.fancybox-1.3.1.pack'

app/views/photos/_new_photo.haml

@@ -2,7 +2,7 @@
   $(function() {
     $("#photo_image").html5_upload({
       // WE INSERT ALBUM_ID PARAM HERE
-      url: "/photos?album_id=#{album.id}",   
+      url: "/photos?album_id=#{@album.id}",   
       sendBoundary: window.FormData || $.browser.mozilla,
       setName: function(text) {
         $("#progress_report_name").text(text);
@@ -12,8 +12,10 @@
         $("#add_photo_loader").fadeOut(400);
 
         $("#photo_title_status").text("Done!");
-        $("#progress_report").html("Great job!");
+        $("#progress_report").html("Good job me!");
-      },
+
+        $("#add_photo_button").addClass("uploading_complete");
+       },
       onStart: function(event, total){
         $("#add_photo_button").html( "Uploading Photos" );
         $("#add_photo_loader").fadeIn(400);
@@ -29,10 +31,10 @@
 %h1
   %span{:id=>"photo_title_status"}
     Add photos to
-    %i= album.name
+    %i= @album.name
-= form_for photo, :html => {:multipart => true} do |f|
+= form_for @photo, :html => {:multipart => true} do |f|
   = f.error_messages
-  = f.hidden_field :album_id, :value => album.id
+  = f.hidden_field :album_id, :value => @album.id
   = f.file_field :image, :multiple => 'multiple'
 
 #progress_report{ :style => "display:none;text-align:center;" }

config/app_config.yml

@@ -1,14 +1,17 @@
 development:
   debug: false
+  socket_debug : false
   socket_port: 8080
   pubsub_server: 'https://pubsubhubbub.appspot.com/'
 
 test:
   debug: false
+  socket_debug : false
   socket_port: 8081
   pubsub_server: 'https://pubsubhubbub.appspot.com/'
 
 production:
   debug: false
+  socket_debug : false
   socket_port: 8080
   pubsub_server: 'https://pubsubhubbub.appspot.com/'

config/initializers/socket.rb

@@ -7,7 +7,7 @@ require "lib/diaspora/websocket"
     EventMachine::WebSocket.start(
                   :host => "0.0.0.0", 
                   :port => APP_CONFIG[:socket_port],
-                  :debug =>APP_CONFIG[:debug]) do |ws|
+                  :debug =>APP_CONFIG[:socket_debug]) do |ws|
       ws.onopen {
         
         sid = Diaspora::WebSocket.subscribe(ws.request['Path'].gsub('/',''), ws)

config/routes.rb

@@ -4,7 +4,7 @@ Diaspora::Application.routes.draw do
   resources :status_messages
   resources :comments
   resources :requests
-  resources :photos
+  resources :photos, :except => [:index]
   resources :albums
   resources :groups
 

public/javascripts/view.js

@@ -1,19 +1,4 @@
 $(document).ready(function(){
-	tinyMCE.init({
-			mode : "exact",
-			elements: "blog_editor",
-			theme : "advanced",
-			plugins : "emotions,spellchecker,advhr,insertdatetime,preview",	
-
-			// Theme options - button# indicated the row# only
-		theme_advanced_buttons1 : "newdocument,|,bold,italic,underline,|,justifyleft,justifycenter,justifyright,fontsizeselect,formatselect",
-		theme_advanced_buttons2 : "cut,copy,paste|,bullist,numlist,|,outdent,indent|,undo,redo,|,link,unlink,anchor,image,|,preview,|,forecolor,backcolor",
-		theme_advanced_buttons3 : "insertdate,inserttime,|,spellchecker,|,sub,sup,|,charmap,emotions",	
-		theme_advanced_toolbar_location : "top",
-		theme_advanced_toolbar_align : "left",
-		//theme_advanced_resizing : true //leave this out as there is an intermittent bug.
-	});
-
 	
 	$('.comment_set').each(function(index) {
 	    if($(this).children().length > 1) {
@@ -86,7 +71,14 @@ $(document).ready(function(){
   $("#add_album_button").fancybox();
   $("#add_group_button").fancybox();
   $("#add_request_button").fancybox({ 'titleShow': false });
-  $("#add_photo_button").fancybox();
+  $("#add_photo_button").fancybox({
+    'onClosed'   :   function(){
+      if($("#add_photo_button").hasClass("uploading_complete")){
+        $("#add_photo_button").removeClass("uploading_complete");
+        reset_photo_fancybox();
+      }
+    }
+  });
 
   //pane_toggler_button("photo");
 
@@ -106,6 +98,12 @@ $(document).ready(function(){
 
 });//end document ready
 
+function reset_photo_fancybox(){
+        album_id = $(".album_id")[0].id;
+        ajax = $.get("/photos/new?album_id=" + album_id, function(){
+          $("#new_photo_pane").html(ajax.responseText)
+        });
+}
 
 function pane_toggler_button( name ) {