Merge branch 'master' of lmno:ascii

6 files changed, 54 insertions, 45 deletions

diff --git a/doc/irssi.txt b/doc/irssi.txt
index 58e84e2..baded1c 100644
--- a/doc/irssi.txt
+++ b/doc/irssi.txt
@@ -8,8 +8,6 @@
          _____/  /_____   /  /     \  \    ____/  /   ____/  /____/  /_____         
      ___/             /__/  /_______\  \__/      /___/      //            /____     
     __________________________________________________________________________      
-                                                                                
-   ~ le irssi faq pour le amelioration des color codes sur l'irc plu parfait! ~
 
 
 OPTIMIZE YOUR TERMINAL FOR COLOR CODES ON OSX
@@ -85,24 +83,24 @@ NORMAL IRSSI OPERATION
 
 If you do not want to do the autojoin thing these are the commands you'd normally use to connect:
 
-/server -ssl irc.jollo.org 9999
-/join #sally
+/server -ssl irc.asdf.us 7777
+/join #ascii
 
 
-SETTING UP IRSSI TO AUTOJOIN #SALLY
+SETTING UP IRSSI TO AUTOJOIN #ASCII
 ===================================
 
 First run irssi, then paste in these commands.
 Please change YOUR_NICK_HERE to your preferred username!
 
-/network add -nick YOUR_NICK_HERE -user YOUR_NICK_HERE -realname "YOUR NAME HERE" Jollo
-/server add -network Jollo -auto -ssl irc.jollo.org 9999
-/channel add -auto #sally Jollo
+/network add -nick YOUR_NICK_HERE -user YOUR_NICK_HERE -realname "YOUR NAME HERE" asdf
+/server add -network asdf -auto -ssl irc.asdf.us 7777
+/channel add -auto #ascii asdf
 /save
 /quit
 
 Now run irssi again.. it should autoconnect to the channels and stuff.
-If you want it to move you into sally by default, you can do ctrl-N and then
+If you want it to move you into #ascii by default, you can do ctrl-N and then
 
 /layout save
 /save
@@ -111,12 +109,12 @@ If you want it to move you into sally by default, you can do ctrl-N and then
 IRC TIPS
 ========
 
-/join #sally       -- join a channel :)
-/part #sally       -- leave a channel ;(
+/join #ascii       -- join a channel :)
+/part #ascii       -- leave a channel ;(
 /quit blabla       -- quit irc (with the quit message 'blabla')
 /list              -- list channels
 /nick booboo       -- change your nick to booboo
-/who #sally        -- show complete list of people on #sally
+/who #ascii        -- show complete list of people on #ascii
 /names             -- show quick list of names
 /msg nick blabla   -- send someone a private message ;)
 
@@ -131,26 +129,10 @@ Fn-up arrow     -- page up (if you don't have a pageup key)
 Fn-down arrow   -- page down (if you don't have a pagedown key)
 
 
-PLINKO TIPS
-===========
-
-Le Jollo IRC is home to a fine bot named PLINKO who you should make friends with :o)
-
-To get started, type:   /query plinko register
-
-Plinko lives in #sally and also #pffffffff where you can ask him to draw things.
-
-He prefers an uncluttered canvas, so in irssi you might want to do:
-
-/ignore -channels #pffffffff * JOINS PARTS QUITS NICKS
-
-
 IRSSI SCRIPTING
 ===============
 
-This is its own can of worms.. One script which is necessary for playing les parlour games
-on Jollo (chess, literati) is "noticelogic.pl". Another script which is nice for differentiating
-ppl in the chat is "nickcolor.pl"..
+This is its own can of worms.  May we suggest:
 
 http://scripts.irssi.org/scripts/noticelogic.pl
 http://scripts.irssi.org/scripts/nickcolor.pl
@@ -158,7 +140,6 @@ http://scripts.irssi.org/scripts/nickcolor.pl
 To make it run on startup, copy it into ~/.irssi/scripts/autorun/  (and restart irssi)
 
 Another fun IRC thing is running an XDCC server for sharing files..
-There may be someone running an XDCC server on Jollo, but you can run your own
 -- for more info see http://asdf.us/xdcc/
 
 
@@ -167,10 +148,6 @@ AND REMEMBER...
 
 Have fun and be safe online!
 
-This irssi FAQ is distributed under the terms of the Jollo LNT License (version 1)
-A copy of this license is available: https://jollo.org/licensing/public/LNT-1.txt
-
-:o)
 
 
 
diff --git a/index.html b/index.html
index c822bb2..8f42f4f 100644
--- a/index.html
+++ b/index.html
@@ -3,6 +3,7 @@
 <head>
 <meta charset="UTF-8">
 <title>asciiblaster</title>
+<meta name="viewport" content="width=device-width, maximum-scale=1.0, user-scalable=yes" />
 <link rel="stylesheet" href="css/sally.css" type="text/css" charset="utf-8" />
 <link rel="stylesheet" href="css/ak.css" type="text/css" charset="utf-8" />
 </head>
diff --git a/js/app.js b/js/app.js
index 64f8bea..6afbbcc 100644
--- a/js/app.js
+++ b/js/app.js
@@ -58,7 +58,7 @@ function bind () {
     var ae = document.activeElement
 
     if (ae !== shader_textarea && ae !== import_textarea && ae !== username_input && ae !== upload_input) {
-      cursor_input.focus()
+      if (is_desktop) cursor_input.focus()
     }
 
     if (selecting) {
@@ -69,6 +69,9 @@ function bind () {
     }
   })
   window.addEventListener("touchend", function(){
+    if (current_tool.name === "text") {
+      if (is_desktop) cursor_input.focus()
+    }
     dragging = false
   })
   
diff --git a/js/draw.js b/js/draw.js
index 407e1c8..9b0e3b9 100644
--- a/js/draw.js
+++ b/js/draw.js
@@ -111,18 +111,18 @@ var draw = (function(){
       line(lex, [ xa[1][0], ya[1][0] ], [ xa[1][1], ya[1][1] ], erasing)
     }
     else {
-      var last_point_mod = [], point_mod = []
       var x_a = mod( last_point[0], w )
       var y_a = mod( last_point[1], h )
       var x_b = mod( point[0], w )
       var y_b = mod( point[1], h )
+      var last_point_mod = [x_b, y_b], point_mod = [x_a, y_a]
       line(lex, last_point_mod, point_mod, erasing)
-      if (mirror_x) {
-        line(lex, [w-last_point_mod[0], last_point_mod[1]], [w-point_mod[0], point_mod[1]], erasing)
-      }
-      if (mirror_y) {
-        line(lex, [last_point_mod[0], h-last_point_mod[1]], [point_mod[0], h-point_mod[1]], erasing)
-      }
+      // if (mirror_x) {
+      //   line(lex, [w-last_point_mod[0], last_point_mod[1]], [w-point_mod[0], point_mod[1]], erasing)
+      // }
+      // if (mirror_y) {
+      //   line(lex, [last_point_mod[0], h-last_point_mod[1]], [point_mod[0], h-point_mod[1]], erasing)
+      // }
     }
     last_point[0] = point[0]
     last_point[1] = point[1]
diff --git a/js/ui/controls.js b/js/ui/controls.js
index 315395d..f75ee67 100644
--- a/js/ui/controls.js
+++ b/js/ui/controls.js
@@ -233,11 +233,11 @@ var controls = (function(){
   controls.advanced.memorable = true
   controls.advanced.use = function(state){
     console.log(state)
-    state = document.body.classList.contains('panke')
+    state = typeof state == "boolean" ? state : ! document.body.classList.contains('panke')
     if (state)
-      document.body.classList.remove('panke')
-    else
       document.body.classList.add('panke')
+    else
+      document.body.classList.remove('panke')
     this.update(state)
   }
 
@@ -346,6 +346,7 @@ var controls = (function(){
     ].forEach(function(lex){
       lex.span.addEventListener('mousedown', function(e){
         lex.focus()
+        if (is_mobile) cursor_input.focus()
       })
     });
 
diff --git a/js/ui/keys.js b/js/ui/keys.js
index 77922c7..3cd6168 100644
--- a/js/ui/keys.js
+++ b/js/ui/keys.js
@@ -204,6 +204,33 @@ var keys = (function(){
     }
   }
 
+  // function cancelZoom() {
+  //   var d = document,
+  //       viewport,
+  //       content,
+  //       maxScale = ',maximum-scale=',
+  //       maxScaleRegex = /,*maximum\-scale\=\d*\.*\d*/;
+
+  //   // this should be a focusable DOM Element
+  //   if (!this.addEventListener || !d.querySelector) {
+  //     return;
+  //   }
+
+  //   viewport = d.querySelector('meta[name="viewport"]');
+  //   content = viewport.content;
+
+  //   function changeViewport(event) {
+  //     // http://nerd.vasilis.nl/prevent-ios-from-zooming-onfocus/
+  //     viewport.content = content + (event.type == 'blur' ? (content.match(maxScaleRegex, '') ? '' : maxScale + 10) : maxScale + 1);
+  //   }
+
+  //   // We could use DOMFocusIn here, but it's deprecated.
+  //   this.addEventListener('focus', changeViewport, true);
+  //   this.addEventListener('blur', changeViewport, false);
+  // }
+  
+  // cancelZoom.bind(cursor_input)();
+
   return keys
 })()