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

Merge branch 'feature_jquery' into use_natives

Browse source 
Conflicts:
	src/static/js/ace2_inner.js
	src/static/js/pluginfw/plugins.js
This commit is contained in:
Matthias Bartelmeß 2012-03-16 18:50:32 +01:00
commit 692e77b4e5
4 changed files with 103 additions and 212 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/static/js/pluginfw/plugins.js
View file

@ -12,6 +12,8 @@ if (!exports.isClient) {
var util = require("util");
}else{
require("../ace2_common.js");
var $, jQuery;
$ = jQuery = require("ep_etherpad-lite/static/js/rjquery").$;
}
exports.prefix = 'ep_';