diff --git a/src/node/utils/Minify.js b/src/node/utils/Minify.js
index 58d08b30e..822ca4b62 100644
--- a/src/node/utils/Minify.js
+++ b/src/node/utils/Minify.js
@@ -28,7 +28,7 @@ var jsp = require("uglify-js").parser;
var pro = require("uglify-js").uglify;
var path = require('path');
var plugins = require("ep_etherpad-lite/static/js/pluginfw/plugins");
-var RequireKernel = require('require-kernel');
+var RequireKernel = require('browserify');
var urlutil = require('url');
var ROOT_DIR = path.normalize(__dirname + "/../../static/");
@@ -252,7 +252,7 @@ function getAceFile(callback) {
founds = [];
}
// 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 += 'Ace2Editor.EMBEDED = Ace2Editor.EMBEDED || {};\n';
@@ -297,7 +297,7 @@ function statFile(filename, callback, dirStatLimit) {
lastModifiedDateOfEverything(function (error, date) {
callback(error, date, !error);
});
- } else if (filename == 'js/require-kernel.js') {
+ } else if (filename == 'js/browserify.js') {
callback(null, requireLastModified(), true);
} else {
fs.stat(ROOT_DIR + filename, function (error, stats) {
@@ -392,7 +392,7 @@ function getFileCompressed(filename, contentType, callback) {
function getFile(filename, callback) {
if (filename == 'js/ace.js') {
getAceFile(callback);
- } else if (filename == 'js/require-kernel.js') {
+ } else if (filename == 'js/browserify.js') {
callback(undefined, requireDefinition());
} else {
fs.readFile(ROOT_DIR + filename, callback);
diff --git a/src/package.json b/src/package.json
index 4b0ae82b4..b4393123a 100644
--- a/src/package.json
+++ b/src/package.json
@@ -13,7 +13,6 @@
"dependencies" : {
"yajsml" : "1.1.6",
"request" : "2.9.100",
- "require-kernel" : "1.0.5",
"resolve" : ">=1.0.0",
"socket.io" : ">=1.2.0",
"ueberDB" : ">=0.2.9",
@@ -40,7 +39,8 @@
"swagger-node-express" : ">=2.1.0",
"channels" : "0.0.x",
"jsonminify" : "0.2.2",
- "measured" : "0.1.3"
+ "measured" : "0.1.3",
+ "browserify" : ">=6.3.2"
},
"bin": { "etherpad-lite": "./node/server.js" },
"devDependencies": {
diff --git a/src/static/js/ace.js b/src/static/js/ace.js
index addc412fc..5495556b9 100644
--- a/src/static/js/ace.js
+++ b/src/static/js/ace.js
@@ -24,7 +24,7 @@
// requires: plugins
// requires: undefined
-var KERNEL_SOURCE = '../static/js/require-kernel.js';
+var KERNEL_SOURCE = '../static/js/browserify.js';
Ace2Editor.registry = {
nextId: 1
diff --git a/src/templates/pad.html b/src/templates/pad.html
index f02670022..10a6b6d73 100644
--- a/src/templates/pad.html
+++ b/src/templates/pad.html
@@ -342,7 +342,7 @@
})();
-
+
diff --git a/src/templates/timeslider.html b/src/templates/timeslider.html
index fceb894f5..8940c2127 100644
--- a/src/templates/timeslider.html
+++ b/src/templates/timeslider.html
@@ -190,7 +190,7 @@
-
+