Commit b3b6b27f authored by Leigh B Stoller's avatar Leigh B Stoller

Do not use require for jquery-ui or jquery-grid, just load directly.

parent 09327b32
...@@ -12,7 +12,7 @@ require(window.APT_OPTIONS.configObject, ...@@ -12,7 +12,7 @@ require(window.APT_OPTIONS.configObject,
'js/lib/text!template/instantiate-modal.html', 'js/lib/text!template/instantiate-modal.html',
'js/lib/text!template/share-modal.html', 'js/lib/text!template/share-modal.html',
// jQuery modules // jQuery modules
'filestyle','marked','jquery-ui','jquery-grid'], 'filestyle','marked'],
function (_, sup, filesize, JacksEditor, ShowImagingModal, moment, ppstart, function (_, sup, filesize, JacksEditor, ShowImagingModal, moment, ppstart,
manageString, waitwaitString, manageString, waitwaitString,
rendererString, showtopoString, oopsString, rspectextviewString, rendererString, showtopoString, oopsString, rspectextviewString,
......
...@@ -2,7 +2,7 @@ require(window.APT_OPTIONS.configObject, ...@@ -2,7 +2,7 @@ require(window.APT_OPTIONS.configObject,
['underscore', 'js/quickvm_sup', 'moment', ['underscore', 'js/quickvm_sup', 'moment',
'js/lib/text!template/show-dataset.html', 'js/lib/text!template/show-dataset.html',
'js/lib/text!template/snapshot-dataset.html', 'js/lib/text!template/snapshot-dataset.html',
'js/image', 'jquery-ui'], 'js/image'],
function (_, sup, moment, mainString, snapshotString, ShowImagingModal) function (_, sup, moment, mainString, snapshotString, ShowImagingModal)
{ {
'use strict'; 'use strict';
......
...@@ -10,7 +10,7 @@ require(window.APT_OPTIONS.configObject, ...@@ -10,7 +10,7 @@ require(window.APT_OPTIONS.configObject,
'js/lib/text!template/oops-modal.html', 'js/lib/text!template/oops-modal.html',
'js/lib/text!template/share-modal.html', 'js/lib/text!template/share-modal.html',
// jQuery modules // jQuery modules
'marked','jquery-ui','jquery-grid'], 'marked'],
function (_, sup, moment, ppstart, function (_, sup, moment, ppstart,
showString, waitwaitString, showString, waitwaitString,
rendererString, showtopoString, rspectextviewString, rendererString, showtopoString, rspectextviewString,
......
...@@ -181,7 +181,9 @@ function SPITFORM($formfields, $errors) ...@@ -181,7 +181,9 @@ function SPITFORM($formfields, $errors)
echo " window.SNAPUUID = '$snapuuid';\n"; echo " window.SNAPUUID = '$snapuuid';\n";
} }
echo "</script>\n"; echo "</script>\n";
echo "<script src='js/lib/jquery-2.0.3.min.js'></script>\n"; echo "<script src='js/lib/jquery.min.js'></script>\n";
echo "<script src='js/lib/jquery-ui.js'></script>\n";
echo "<script src='js/lib/jquery.appendGrid-1.3.1.min.js'></script>\n";
echo "<script src='js/lib/codemirror-min.js'></script>\n"; echo "<script src='js/lib/codemirror-min.js'></script>\n";
echo "<script src='js/lib/bootstrap.js'></script>\n"; echo "<script src='js/lib/bootstrap.js'></script>\n";
echo "<script src='js/lib/require.js' data-main='js/manage_profile'> echo "<script src='js/lib/require.js' data-main='js/manage_profile'>
......
...@@ -163,7 +163,8 @@ echo " window.CANAPPROVE = $canapprove;\n"; ...@@ -163,7 +163,8 @@ echo " window.CANAPPROVE = $canapprove;\n";
echo " window.CANREFRESH = $canrefresh;\n"; echo " window.CANREFRESH = $canrefresh;\n";
echo " window.CANSNAPSHOT= $cansnapshot;\n"; echo " window.CANSNAPSHOT= $cansnapshot;\n";
echo "</script>\n"; echo "</script>\n";
SPITREQUIRE("show-dataset"); SPITREQUIRE("show-dataset",
"<script src='js/lib/jquery-ui.js'></script>\n");
# For progress bubbles in the imaging modal. # For progress bubbles in the imaging modal.
echo "<link rel='stylesheet' href='css/progress.css'>\n"; echo "<link rel='stylesheet' href='css/progress.css'>\n";
echo "<link rel='stylesheet' href='css/codemirror.css'>\n"; echo "<link rel='stylesheet' href='css/codemirror.css'>\n";
......
...@@ -118,7 +118,9 @@ echo "</script>\n"; ...@@ -118,7 +118,9 @@ echo "</script>\n";
echo "<script src='js/lib/codemirror-min.js'></script>\n"; echo "<script src='js/lib/codemirror-min.js'></script>\n";
SPITREQUIRE("show-profile"); SPITREQUIRE("show-profile",
"<script src='js/lib/jquery-ui.js'></script>\n".
"<script src='js/lib/jquery.appendGrid-1.3.1.min.js'></script>");
SPITFOOTER(); SPITFOOTER();
?> ?>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment