Fix wodocollabeditor conflicts with other libraries because of global require and define AMD modulation

This commit is contained in:
Hadi Nategh
2016-10-27 18:47:02 +02:00
parent 3b76072885
commit 6038936cef
270 changed files with 476 additions and 18759 deletions

View File

@@ -24,7 +24,7 @@
/*global runtime,core,define,require,dijit */
define("webodf/editor/widgets/dialogWidgets/alignmentPane", [
webodfModule.define("webodf/editor/widgets/dialogWidgets/alignmentPane", [
"webodf/editor/widgets/dialogWidgets/idMangler"],
function (IdMangler) {
"use strict";
@@ -85,7 +85,7 @@ function (IdMangler) {
};
function init(cb) {
require([
webodfModule.require([
"dojo",
"dojo/ready",
"dijit/layout/ContentPane"],