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 define, require, dojo, dijit, runtime */
define("webodf/editor/widgets/paragraphStylesDialog", [
webodfModule.define("webodf/editor/widgets/paragraphStylesDialog", [
"webodf/editor/widgets/dialogWidgets/idMangler"],
function (IdMangler) {
"use strict";
@@ -36,7 +36,7 @@ function (IdMangler) {
stylePicker, alignmentPane, fontEffectsPane;
function makeWidget(callback) {
require([
webodfModule.require([
"dijit/Dialog",
"dijit/TooltipDialog",
"dijit/popup",
@@ -272,7 +272,7 @@ function (IdMangler) {
dialog.domNode.appendChild(actionBar);
require([
webodfModule.require([
"webodf/editor/widgets/paragraphStyles",
"webodf/editor/widgets/dialogWidgets/alignmentPane",
"webodf/editor/widgets/dialogWidgets/fontEffectsPane"