From d1e2b9d1bf7ab44a790c9f1a15fbed9ba0ae1ab0 Mon Sep 17 00:00:00 2001
From: Iam Naughton Phier <truck@notonfire.co.uk>
Date: Wed, 6 Aug 2014 14:19:30 +0300
Subject: [PATCH] edit location field + saving location field

---
 editor/sahliedit.js        |  7 +++++++
 editor/sahliedit.litcoffee |  4 ++++
 editor/sahlieditor.html    | 29 +++++++++++++++--------------
 sahli.js                   | 11 +++++++----
 4 files changed, 33 insertions(+), 18 deletions(-)

diff --git a/editor/sahliedit.js b/editor/sahliedit.js
index ed3498a..dbc6a6b 100644
--- a/editor/sahliedit.js
+++ b/editor/sahliedit.js
@@ -62,6 +62,7 @@
         "file": "",
         "name": "",
         "amiga": true,
+        "filetype": 'plain',
         "width": "",
         "author": "",
         "font": "Propaz",
@@ -77,6 +78,7 @@
         "css": ""
       };
       this.empty = {
+        "location": "",
         "slides": this.emptyslidesdef,
         "filedata": []
       };
@@ -97,6 +99,11 @@
 
     Sahli.prototype.edit = function() {
       $('#buttonbox').hide();
+      $('#dirlocation').change((function(_this) {
+        return function(event) {
+          return _this.data.location = event.target.value;
+        };
+      })(this));
       $('#listsave').button({
         icons: {
           primary: "ui-icon-disk"
diff --git a/editor/sahliedit.litcoffee b/editor/sahliedit.litcoffee
index 1788789..34034c5 100644
--- a/editor/sahliedit.litcoffee
+++ b/editor/sahliedit.litcoffee
@@ -87,6 +87,7 @@ a html template, and a css file.
                 "file": "",
                 "name": "",
                 "amiga": true,
+                "filetype": 'plain',
                 "width": "",
                 "author": "",
                 "font": "Propaz",
@@ -102,6 +103,7 @@ a html template, and a css file.
                 "css": ""
             }
             @empty = {
+                "location": "",
                 "slides": @emptyslidesdef,
                 "filedata": [ ]
             }
@@ -122,6 +124,8 @@ edit button.
 
         edit: ->
             $('#buttonbox').hide()
+            $('#dirlocation').change (event) =>
+                @.data.location = event.target.value
             $('#listsave').button {icons: {primary:"ui-icon-disk"}}
                 .click =>
                     console.log dumpjson @.data
diff --git a/editor/sahlieditor.html b/editor/sahlieditor.html
index c666416..7185941 100644
--- a/editor/sahlieditor.html
+++ b/editor/sahlieditor.html
@@ -7,7 +7,7 @@
 	<script src="//code.jquery.com/ui/1.10.4/jquery-ui.min.js" type="text/javascript" charset="utf-8" ></script>
 -->
   <script src="jquery-2.1.0.min.js" type="text/javascript" async defer></script>
-  <script src="jquery-ui.min.js" type="text/javascript" async defer></script>  
+  <script src="jquery-ui.min.js" type="text/javascript" async defer></script>
 	<script src="/editor/sahliedit.js" type="text/javascript" charset="utf-8" async defer></script>
 	<link rel="stylesheet" href="/editor/sahliedit.css">
 	<link rel="stylesheet" href="//code.jquery.com/ui/1.10.4/themes/dot-luv/jquery-ui.css">
@@ -22,6 +22,7 @@
 	</div>
 
     <div class='hidden' id='list'>
+        <label>Location of Files:<input type="text" id='dirlocation' name="location" value=""></label>
         <ol id='sortlist'>
         </ol>
         <p id='listsave'>Save</p>
@@ -39,11 +40,11 @@
                             <input id='entryfile' type="text" name="file" value="" placeholder="">
                             <input id='entryfilepick' type="file" class='hidden' name="pickfile" value="" placeholder="">
 						</li>
-						<li>                
-							<label for="file">Title:</label>            
+						<li>
+							<label for="file">Title:</label>
 							<input id='entryname' type="text" name="name" value="" placeholder="">
 						</li>
-						<li>                
+						<li>
 							<label for="author">Author's name:</label>
 							<input id='entryauthor' type="text" name="author" value="" placeholder="">
 						</li>
@@ -52,7 +53,7 @@
 				<div class='groupbox' id='displaydata'>
 					<p>Display:</p>
 					<div class='drop' id='fl'>
-						<li>                
+						<li>
 							<label for="file">Ascii or Ansi?</label>
 							<button id='entryamiga' name="amiga" id='amiga' type='button' value='1'>Ascii</button>
 						</li>
@@ -71,11 +72,11 @@
                 <option value="tundra">tundra</option>
               </select>
             </li>
-						<li>                
+						<li>
 							<label for="width">Width of file:</label>
 							<input id='entrywidth' type="number" name="width" value="80" placeholder="">
 						</li>
-						<li>                
+						<li>
 							<label for="font">Font:</label>
 							<select id='entryfont' name="font">
 								<option value="Propaz">Propaz</option>
@@ -86,7 +87,7 @@
 							</select>
 						</li>
 						<div class='45box'>
-							<li>                
+							<li>
 								<label for="color">Text Color:</label>
                                 <select name="color" id='entrycolor' class='colorbox'>
                                     <option value="#E0E0E0">Light Grey</option>
@@ -107,7 +108,7 @@
                                     <option value="#000000">Black</option>
                                 </select>
 							</li>
-							<li>                
+							<li>
 								<label for="bg">Background color:</label>
                                 <select name="bg" id='entrybg' class='colorbox'>
                                     <option value="#E0E0E0">Light Grey</option>
@@ -142,21 +143,21 @@
 				<div class='groupbox' id='optionals'>
 				<p>Optional text:</p>
 				<div class='drop'>
-					<li>                
+					<li>
 						<label for="line1">Optional Info line 1:</label>
 						<input id='entryline1' type="text" name="line1" value="" placeholder="">
 					</li>
-					<li>                
+					<li>
 						<label for="line2">Optional Info line 2:</label>
 						<input id='entryline2' type="text" name="line2" value="" placeholder="">
 					</li>
-					<li>                
-						<label for="text">Optional Text (notes, comments, etc):</label>            
+					<li>
+						<label for="text">Optional Text (notes, comments, etc):</label>
 						<textarea id='entrytext' name='text'></textarea>
 					</li>
 				</div>
 			</ul>
-		</form> 
+		</form>
 	</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/sahli.js b/sahli.js
index 67d5e37..9e6219b 100644
--- a/sahli.js
+++ b/sahli.js
@@ -10,7 +10,7 @@
 // Uses fonts by DMG, http://trueschool.se
 // Uses SixteenColors textmode js library for rendering
 
-var Sahli = function() {
+var Sahli = function () {
     this.outbox = $('div#outbox');
     this.dbox = $('div#drawbox');
     this.image = 0;
@@ -33,9 +33,9 @@ var Sahli = function() {
     this.currentpic = 0;
     this.nonfsheight = document.height - 40;
 
-    this.loadpic = function(picdata, inserthere) {
+    this.loadpic = function (picdata, inserthere) {
         var jumptable = {
-            'plain':this.loadplain(),
+            'plain':this.loadplain(picdata,inserthere),
             'xbin':this.loadxbin(),
             'ice':this.loadice(),
             'avatar':this.loadavatar(),
@@ -46,7 +46,8 @@ var Sahli = function() {
             'adf':this.loadadf(),
             'tundra':this.loadtundra()
         }
-        jumptable[picdata.filetype](picdata,inserthere);
+        console.log('here');
+       jumptable[picdata.filetype];
     }
 
     this.loadplain = function(picdata, inserthere) {
@@ -84,6 +85,7 @@ var Sahli = function() {
         };
         req.open('GET', fname , true);
         req.send(null);
+    }
 
     this.loadansi = function(picdata,inserthere) {
         this.image = new ImageTextModeANSI();
@@ -99,6 +101,7 @@ var Sahli = function() {
             // fix, then deal with.
             sahli.loaderror(inserthere,fname,'Not found',404);
         }
+    }
 
     this.loadxbin = function(picdata,inserthere){
         alert('xbin');