fuwafuwa
/
etherpad-lite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #571 from fourplusone/fix_ie9_plugins 

Fix ie9 plugins
This commit is contained in:
John McLear 2012-03-24 07:58:07 -07:00
parent debdc340af 208d88cc03
commit f2ea56334d
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/node/hooks/express/static.js
View File

@ -35,7 +35,7 @@ exports.expressCreateServer = function (hook_name, args, cb) {
// serve plugin definitions
// not very static, but served here so that client can do require("pluginfw/static/js/plugin-definitions.js");
args.app.get('/pluginfw/plugin-definitions.json', function (req, res, next) {
res.header("Content-Type","application/json; charset: utf-8");
res.header("Content-Type","application/json; charset=utf-8");
res.write(JSON.stringify({"plugins": plugins.plugins, "parts": plugins.parts}));
res.end();
});

3
src/static/js/pluginfw/plugins.js
View File

@ -78,6 +78,9 @@ if (exports.isClient) {
exports.hooks = exports.extractHooks(exports.parts, "client_hooks");
exports.loaded = true;
cb();
}).error(function(xhr, s, err){
console.error("Failed to load plugin-definitions: " + err);
cb();
});
}
} else {