From c2f9f9ae233a4883b62afe54e9e45e5eb262e6f1 Mon Sep 17 00:00:00 2001
From: pepperpepperpepper <pepper@scannerjammer.com>
Date: Mon, 16 Nov 2015 15:08:02 -0800
Subject: ready to merge to main branch

---
 share/frontend/impattern/index.html | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'share/frontend/impattern')

diff --git a/share/frontend/impattern/index.html b/share/frontend/impattern/index.html
index b26ded5..417ddd9 100755
--- a/share/frontend/impattern/index.html
+++ b/share/frontend/impattern/index.html
@@ -3,7 +3,7 @@
 <link href='http://fonts.googleapis.com/css?family=Orienta|Roboto' rel='stylesheet' type='text/css'>
 <link href='css/normalize.css' rel='stylesheet' type='text/css'>
 <link href='css/unsemantic-grid-responsive.css' rel='stylesheet' type='text/css'>
-<link href='css/impattern-main.css' rel='stylesheet' type='text/css'/>
+<link href='css/main.css' rel='stylesheet' type='text/css'/>
 <link href='css/overlay.css' rel='stylesheet' type='text/css'/>
 <link href='css/sketch.css' rel='stylesheet' type='text/css'/>
 <link href='css/result.css' rel='stylesheet' type='text/css'/>
@@ -296,7 +296,7 @@ $(document).ready(function(){
     }
   console.log(
     { 
-      'pattern_data' : JSON.stringify(window.custom_pattern),
+      'pattern_data' : window.custom_pattern,
       'pattern_url' : $('.patterns').attr("current_pattern"),
       'image_url' : $('input.image_input').val(), 
       'username' : $('#username').val(),
@@ -315,7 +315,6 @@ $(document).ready(function(){
       'username' : $('#username').val(),
     }
   }).done(function( msg ) {
-    msg = JSON.parse(msg)
     $('#submit').prop("disabled", false);
     $('#submit').html("ROCK");
     $('body').css("background", "url(img/loading.gif)");
@@ -324,7 +323,6 @@ $(document).ready(function(){
         alert( "There was an error processing your request ");
         console.log(msg);
       }
-      console.log(msg)
       console.log("new url: "+msg.url);
       update_username($("#username").val());
       show_finished_image(msg.url);
-- 
cgit v1.2.3-70-g09d2