Fixed require.js dependencies. Had to reintroduce a resource called C…

…oreComponents so that EE 4.8 still finds it when resolving dependencies
webdetails · Nov 12, 2012 · 1b9db11 · 1b9db11
1 parent b2619da
commit 1b9db11
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 3 deletions.
diff --git a/bi-platform-v2-plugin/cdf/js/CoreComponents.js b/bi-platform-v2-plugin/cdf/js/CoreComponents.js
@@ -0,0 +1 @@
+//This is here because we need to maintain compatibility with 4.8 EE
diff --git a/bi-platform-v2-plugin/cdf/js/cdf-require-js-cfg.js b/bi-platform-v2-plugin/cdf/js/cdf-require-js-cfg.js
@@ -15,10 +15,56 @@ requireCfg['shim']['cdf/cdf-module'] = ['cdf/Dashboards',
 	'cdf/simile/ajax/simile-ajax-api',
 	'cdf/simile/ajax/scripts/json',
 	'cdf/json',
-	'cdf/CoreComponents'];
+    'cdf/lib/shims',
+	'cdf/backbone',
+	'cdf/underscore',
+	'cdf/mustache',
+	'cdf/components/ccc',
+	'cdf/components/core',
+    'cdf/components/input'	,
+    'cdf/components/jfreechart',    
+    'cdf/components/maps',
+    'cdf/components/navigation',
+    'cdf/components/pentaho',
+    'cdf/components/simpleautocomplete',
+	'cdf/components/table'];
+
+
+requireCfg['shim']['cdf/CoreComponents'] = [
+	'cdf/components/core',
+	'cdf/components/ccc',
+    'cdf/components/input'	,
+    'cdf/components/jfreechart',    
+    'cdf/components/maps',
+    'cdf/components/navigation',
+    'cdf/components/pentaho',
+    'cdf/components/simpleautocomplete',
+	'cdf/components/table'
+];
+
+
+
+requireCfg['shim']['cdf/Dashboards'] = [
+    'cdf/Base',
+    'cdf/underscore',
+    'cdf/backbone',
+    'cdf/mustache', 
+    'cdf/lib/shims'    
+];
+
+
+requireCfg['shim']['cdf/backbone'] = ['cdf/underscore'];
+
+requireCfg['shim']['cdf/components/core'] = ['cdf/Dashboards'];
+requireCfg['shim']['cdf/components/ccc'] = ['cdf/components/core'];
+requireCfg['shim']['cdf/components/input'] = ['cdf/components/core'];
+requireCfg['shim']['cdf/components/jfreechart'] = ['cdf/components/core'];
+requireCfg['shim']['cdf/components/maps'] = ['cdf/components/core'];
+requireCfg['shim']['cdf/components/navigation'] = ['cdf/components/core'];
+requireCfg['shim']['cdf/components/pentaho'] = ['cdf/components/core'];
+requireCfg['shim']['cdf/components/simpleautocomplete'] = ['cdf/components/core'];
+requireCfg['shim']['cdf/components/table'] = ['cdf/components/core'];
 
-requireCfg['shim']['cdf/Dashboards'] = ['cdf/Base'];
-requireCfg['shim']['cdf/CoreComponents'] = ['cdf/Dashboards'];
 requireCfg['shim']['cdf/jquery.ui'] = ['cdf/jquery'];
 requireCfg['shim']['cdf/jquery-impromptu.3.1'] = ['cdf/jquery'];
 requireCfg['shim']['cdf/jquery-ui-datepicker-i18n'] = ['cdf/jquery.ui'];