mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-27 10:56:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

wishful thinking initial attempt

Browse source
This commit is contained in:
John McLear 2014-11-22 13:50:19 +00:00
parent 488d6890f9
commit 92de776c5d
5 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/node/utils/Minify.js
View file

@ -28,7 +28,7 @@ var jsp = require("uglify-js").parser;
var pro = require("uglify-js").uglify; var pro = require("uglify-js").uglify;
var path = require('path'); var path = require('path');
var plugins = require("ep_etherpad-lite/static/js/pluginfw/plugins"); var plugins = require("ep_etherpad-lite/static/js/pluginfw/plugins");
var RequireKernel = require('require-kernel'); var RequireKernel = require('browserify');
var urlutil = require('url'); var urlutil = require('url');
var ROOT_DIR = path.normalize(__dirname + "/../../static/"); var ROOT_DIR = path.normalize(__dirname + "/../../static/");
@ -252,7 +252,7 @@ function getAceFile(callback) {
founds = []; founds = [];
} }
// Always include the require kernel. // Always include the require kernel.
founds.push('$$INCLUDE_JS("../static/js/require-kernel.js")'); founds.push('$$INCLUDE_JS("../static/js/browserify.js")');
data += ';\n'; data += ';\n';
data += 'Ace2Editor.EMBEDED = Ace2Editor.EMBEDED || {};\n'; data += 'Ace2Editor.EMBEDED = Ace2Editor.EMBEDED || {};\n';
@ -297,7 +297,7 @@ function statFile(filename, callback, dirStatLimit) {
lastModifiedDateOfEverything(function (error, date) { lastModifiedDateOfEverything(function (error, date) {
callback(error, date, !error); callback(error, date, !error);
}); });
} else if (filename == 'js/require-kernel.js') { } else if (filename == 'js/browserify.js') {
callback(null, requireLastModified(), true); callback(null, requireLastModified(), true);
} else { } else {
fs.stat(ROOT_DIR + filename, function (error, stats) { fs.stat(ROOT_DIR + filename, function (error, stats) {
@ -392,7 +392,7 @@ function getFileCompressed(filename, contentType, callback) {
function getFile(filename, callback) { function getFile(filename, callback) {
if (filename == 'js/ace.js') { if (filename == 'js/ace.js') {
getAceFile(callback); getAceFile(callback);
} else if (filename == 'js/require-kernel.js') { } else if (filename == 'js/browserify.js') {
callback(undefined, requireDefinition()); callback(undefined, requireDefinition());
} else { } else {
fs.readFile(ROOT_DIR + filename, callback); fs.readFile(ROOT_DIR + filename, callback);

4
src/package.json
View file

@ -13,7 +13,6 @@
"dependencies" : { "dependencies" : {
"yajsml" : "1.1.6", "yajsml" : "1.1.6",
"request" : "2.9.100", "request" : "2.9.100",
"require-kernel" : "1.0.5",
"resolve" : ">=1.0.0", "resolve" : ">=1.0.0",
"socket.io" : ">=1.2.0", "socket.io" : ">=1.2.0",
"ueberDB" : ">=0.2.9", "ueberDB" : ">=0.2.9",
@ -40,7 +39,8 @@
"swagger-node-express" : ">=2.1.0", "swagger-node-express" : ">=2.1.0",
"channels" : "0.0.x", "channels" : "0.0.x",
"jsonminify" : "0.2.2", "jsonminify" : "0.2.2",
"measured" : "0.1.3" "measured" : "0.1.3",
"browserify" : ">=6.3.2"
}, },
"bin": { "etherpad-lite": "./node/server.js" }, "bin": { "etherpad-lite": "./node/server.js" },
"devDependencies": { "devDependencies": {

2
src/static/js/ace.js
View file

@ -24,7 +24,7 @@
// requires: plugins // requires: plugins
// requires: undefined // requires: undefined
var KERNEL_SOURCE = '../static/js/require-kernel.js'; var KERNEL_SOURCE = '../static/js/browserify.js';
Ace2Editor.registry = { Ace2Editor.registry = {
nextId: 1 nextId: 1

2
src/templates/pad.html
View file

@ -342,7 +342,7 @@
})(); })();
</script> </script>
<script type="text/javascript" src="../static/js/require-kernel.js"></script> <script type="text/javascript" src="../static/js/browserify.js"></script>
<script type="text/javascript" src="../socket.io/socket.io.js"></script> <script type="text/javascript" src="../socket.io/socket.io.js"></script>
<!-- Include base packages manually (this help with debugging) --> <!-- Include base packages manually (this help with debugging) -->

2
src/templates/timeslider.html
View file

@ -190,7 +190,7 @@
</div> </div>
</div> </div>
<script type="text/javascript" src="../../static/js/require-kernel.js"></script> <script type="text/javascript" src="../../static/js/browserify.js"></script>
<script type="text/javascript" src="../../socket.io/socket.io.js"></script> <script type="text/javascript" src="../../socket.io/socket.io.js"></script>
<!-- Include base packages manually (this help with debugging) --> <!-- Include base packages manually (this help with debugging) -->