merge

soliton4 · Dec 9, 2014 · 282de6c · 282de6c
2 parents 52d6e6c + 2ebc8db
commit 282de6c
Show file tree

Hide file tree

Showing 8 changed files with 900 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@ npm install node-mirror
 node node_modules/node-mirror/bin/nodeMirror.js --port 3000 --dir /home/sol/projects --username sol --password mysupersecretpassword
 ```
 
-or glboal installed
+or global installed
 ```
 nodeMirror --port 3000 --dir /home/sol/projects --username sol --password mysupersecretpassword
 ```

diff --git a/av2pass-0.log b/av2pass-0.log
diff --git a/generic-js/CodeMirror-original b/generic-js/CodeMirror-original
diff --git a/regtest.js b/regtest.js
@@ -0,0 +1,7 @@
+s  = "keyless.io/bla";
+
+reg = /(http:\/\/)?/;
+
+console.log(s.search(/^((http:\/\/)|(https:\/\/))?([a-zA-Z]?[a-zA-Z0-9\-]*\.)?keyless.io[$\/]/)); // [^\/]?
+
+console.log(s.search(/[\w]/)); // [^\/]?
diff --git a/src/main/x11Fun.js b/src/main/x11Fun.js
@@ -52,7 +52,7 @@ define([
           var y = parseInt(ar.pop(), 10);
           var x = parseInt(ar.pop(), 10);
           def.resolve({ x: x, y: y });
-          //def.resolve({ x: 300, y: 150 });
+          //def.resolve({ x: 600, y: 400 });
           //res.end();
         });
       });

diff --git a/src/pres/nodeMirror.txt b/src/pres/nodeMirror.txt
@@ -0,0 +1,19 @@
+codemirror editor
+tree
+binary
+less
+html
+peg.js
+promiseland
+terminal
+debugger
+music
+themes
+image
+audio
+x11
+
+technical
+extend
+server calls
+dojo
diff --git a/src/test/test.c b/src/test/test.c
diff --git a/test.less b/test.less