From 54475086f2e47a61271a3f0c408bc68b54c6020f Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 15 Nov 2016 17:35:19 -0500
Subject: linkin photos

---
 public/assets/js/lib/views/LinksView.js  |  1 +
 public/assets/js/lib/views/PhotoView.js  | 11 ++++++++---
 public/assets/js/lib/views/UploadView.js | 11 +++++++----
 3 files changed, 16 insertions(+), 7 deletions(-)

(limited to 'public/assets/js/lib')

diff --git a/public/assets/js/lib/views/LinksView.js b/public/assets/js/lib/views/LinksView.js
index 75feabb..1514d8a 100644
--- a/public/assets/js/lib/views/LinksView.js
+++ b/public/assets/js/lib/views/LinksView.js
@@ -10,6 +10,7 @@ var LinksView = View.extend({
   template: $("#link-template").html(),
 
   initialize: function(){
+    app.socket.on("link", this.append.bind(this))
   },
   
   show: function(){
diff --git a/public/assets/js/lib/views/PhotoView.js b/public/assets/js/lib/views/PhotoView.js
index e7b0732..ea77e01 100644
--- a/public/assets/js/lib/views/PhotoView.js
+++ b/public/assets/js/lib/views/PhotoView.js
@@ -60,11 +60,16 @@ var PhotoView = (function(){
         this.$ratio.val()
         this.updateRatio()
       }.bind(this)
-
-      this.load("/assets/img/test.png")
     },
     
-    load: function(url){
+    load: function(f){
+      var url
+      if (typeof f == "string") {
+        url = f
+      }
+      else {
+       url = URL.createObjectURL(file)
+      }
       this.img.src = url
       console.log("load", url)
       this.show()
diff --git a/public/assets/js/lib/views/UploadView.js b/public/assets/js/lib/views/UploadView.js
index 5f51324..f0ac79e 100644
--- a/public/assets/js/lib/views/UploadView.js
+++ b/public/assets/js/lib/views/UploadView.js
@@ -27,17 +27,20 @@ var UploadView = View.extend({
     if (! file) return
     if ( ! file.type.match('image.*')) return
     
-    app.views.home.PhotoView.load( URL.createObjectURL(file) )
+    this.file = file
+    app.views.home.PhotoView.load( file )
   },
   
-  upload: function(data){
+  upload: function(file){
     var fd = new FormData()
-    fd.append('image', data)
+    var _csrf = $("meta[name='_csrf']").attr('content')
+    fd.append('_csrf', file)
+    fd.append('image', file)
     
     var request = $.ajax({
       url: "/_irc/image",
       type: "post",
-      data: data,
+      data: fd,
       processData: false,
       contentType: false,
     })
-- 
cgit v1.2.3-70-g09d2