Claytonia/cryptalk
Claytonia
/
cryptalk
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Finishing the move to requirejs

This commit is contained in:
Hexagon 2017-02-22 22:22:28 +01:00
parent fd8e8a9915
commit 5015caf55a
6 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -111,10 +111,10 @@ Browse to ```http://localhost:8080```
To work on the JavaScript, update public/index.html to use js/lib/main.js instead of js/cryptalk.min.js To work on the JavaScript, update public/index.html to use js/lib/main.js instead of js/cryptalk.min.js
To update the bundled and minified client JavaScript, install require.js To update the bundled and minified client JavaScript, install requirejs
``` ```
npm install require.js -g npm install requirejs -g
``` ```
... and run this in the project root directory ... and run this in the project root directory

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name" : "cryptalk", "name" : "cryptalk",
"version" : "1.1.17", "version" : "1.1.18",
"description" : "Encrypted HTML5/Node.JS instant chat", "description" : "Encrypted HTML5/Node.JS instant chat",
"main" : "server.js", "main" : "server.js",
"subdomain": "cryptalk", "subdomain": "cryptalk",

10
public/css/default.css
View File

@ -17,7 +17,7 @@ html {
body, html { body, html {
min-height: 100%; min-height: 100%;
min-width: 600px; min-width: 600px;
background-color: #000000; background-color: #181A1D;
overflow: hidden; overflow: hidden;
padding: 0px; padding: 0px;
margin:0px; margin:0px;
@ -46,11 +46,11 @@ body, html {
#chat li { #chat li {
white-space: pre; white-space: pre;
padding: 2px 15px; padding: 2px 15px;
color: #606006; color: #808008;
} }
#chat li .timestamp { #chat li .timestamp {
color: #808008; color: #A0A00A;
} }
/* Message types */ /* Message types */
@ -91,8 +91,10 @@ body, html {
padding: 5px 5px 5px 15px; padding: 5px 5px 5px 15px;
color: #FFFFFF; color: #FFFFFF;
background-color:#141414; background-color:#272A2E;
height:30px; height:30px;
border-top: 2px solid #153315;
} }
#input { z-index: 1; } #input { z-index: 1; }

2
public/js/cryptalk.min.js vendored
View File

File diff suppressed because one or more lines are too long

3
public/js/lib/$.js
View File

@ -1,9 +1,8 @@
define(['$.utils', '$.proto'], function (utils, proto) { define(['$.utils', '$.proto'], function (utils, proto) {
// Create a custom edition of Array, extended with $.proto // Create a custom edition of Array, extended with $.proto
var ElementArray = function () {}; function ElementArray () {};
ElementArray.prototype = new Array; ElementArray.prototype = new Array;
ElementArray.constructor = Array;
for(var key in proto) ElementArray.prototype[key] = proto[key]; for(var key in proto) ElementArray.prototype[key] = proto[key];
// Create to actual dollar function // Create to actual dollar function