Adding uuid-js in webroot/js and in core-app.js to download while loa…

…ding dashboard. Related-Bug: #1326040 Change-Id: I617b97b66d83a3a48576461edf35a58b3a657bfc
Juniper · Apr 27, 2015 · dfb918b · dfb918b
1 parent 813522c
commit dfb918b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/dev-install.sh b/dev-install.sh
@@ -221,6 +221,10 @@ mkdir webroot/assets/bezierjs
 cp -af ./$THIRD_PARTY/bezierjs-gh-pages/lib/bezier.js webroot/assets/bezierjs/bezier.js
 #End - Copy bezier from $THIRD_PARTY
 
+#Start - Copy uuid.js from $THIRD_PARTY
+cp -af ./$THIRD_PARTY/uuid.js webroot/js/uuid.js
+#End - Copy uuid.js from $THIRD_PARTY
+
 #Start - Merging All JS files
 rm -f webroot/js/contrail-all-1.js
 rm -f webroot/js/contrail-all-2.js
@@ -295,6 +299,7 @@ MAINFILE[54]=webroot/assets/jquery/js/jquery.panzoom.min.js
 MAINFILE[55]=webroot/assets/jquery-contextMenu/js/jquery.ui.position.js
 MAINFILE[56]=webroot/assets/jquery-contextMenu/js/jquery.contextMenu.js
 MAINFILE[57]=webroot/assets/bezierjs/bezier.js
+MAINFILE[58]=webroot/js/uuid.js
 
 cat ${MAINFILE[0]} > webroot/js/contrail-all-1.js
 cat ${MAINFILE[1]} >> webroot/js/contrail-all-1.js
@@ -360,6 +365,7 @@ cat ${MAINFILE[54]} >> webroot/js/contrail-all-7.js
 cat ${MAINFILE[55]} >> webroot/js/contrail-all-7.js
 cat ${MAINFILE[56]} >> webroot/js/contrail-all-7.js
 cat ${MAINFILE[57]} >> webroot/js/contrail-all-7.js
+cat ${MAINFILE[58]} >> webroot/js/contrail-all-7.js
 
 # End - Merging All JS files
 

diff --git a/webroot/js/core-app.js b/webroot/js/core-app.js
@@ -80,6 +80,7 @@ requirejs.config({
         'graph-view': 'js/views/GraphView',
         'contrail-graph-model': 'js/models/ContrailGraphModel',
         'contrail-remote-data-handler': 'js/models/ContrailRemoteDataHandler',
+        'uuid-js': 'js/uuid',
         'core-cache': 'js/core-cache',
         'core-init': 'js/core-init'
     },

diff --git a/webroot/js/core-init.js b/webroot/js/core-init.js
@@ -13,7 +13,7 @@ var initDepFiles = [
     'jquery.tristate', 'jquery.multiselect', 'jquery.multiselect.filter', 'jquery.steps.min', 'slick.dataview',
     'joint', 'joint.layout.DirectedGraph', 'jquery.panzoom', 'joint.contrail', 'jquery.ui.position',
     'jquery.contextMenu', 'slick.checkboxselectcolumn', 'slick.rowselectionmodel',
-    'backbone', 'text', 'contrail-model', 'bezier'
+    'backbone', 'text', 'contrail-model', 'bezier', 'uuid-js'
 ];