Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emulab
emulab-devel
Commits
b3b6b27f
Commit
b3b6b27f
authored
Apr 21, 2015
by
Leigh B Stoller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Do not use require for jquery-ui or jquery-grid, just load directly.
parent
09327b32
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
11 additions
and
6 deletions
+11
-6
www/aptui/js/manage_profile.js
www/aptui/js/manage_profile.js
+1
-1
www/aptui/js/show-dataset.js
www/aptui/js/show-dataset.js
+1
-1
www/aptui/js/show-profile.js
www/aptui/js/show-profile.js
+1
-1
www/aptui/manage_profile.php
www/aptui/manage_profile.php
+3
-1
www/aptui/show-dataset.php
www/aptui/show-dataset.php
+2
-1
www/aptui/show-profile.php
www/aptui/show-profile.php
+3
-1
No files found.
www/aptui/js/manage_profile.js
View file @
b3b6b27f
...
...
@@ -12,7 +12,7 @@ require(window.APT_OPTIONS.configObject,
'
js/lib/text!template/instantiate-modal.html
'
,
'
js/lib/text!template/share-modal.html
'
,
// jQuery modules
'
filestyle
'
,
'
marked
'
,
'
jquery-ui
'
,
'
jquery-grid
'
],
'
filestyle
'
,
'
marked
'
],
function
(
_
,
sup
,
filesize
,
JacksEditor
,
ShowImagingModal
,
moment
,
ppstart
,
manageString
,
waitwaitString
,
rendererString
,
showtopoString
,
oopsString
,
rspectextviewString
,
...
...
www/aptui/js/show-dataset.js
View file @
b3b6b27f
...
...
@@ -2,7 +2,7 @@ require(window.APT_OPTIONS.configObject,
[
'
underscore
'
,
'
js/quickvm_sup
'
,
'
moment
'
,
'
js/lib/text!template/show-dataset.html
'
,
'
js/lib/text!template/snapshot-dataset.html
'
,
'
js/image
'
,
'
jquery-ui
'
],
'
js/image
'
],
function
(
_
,
sup
,
moment
,
mainString
,
snapshotString
,
ShowImagingModal
)
{
'
use strict
'
;
...
...
www/aptui/js/show-profile.js
View file @
b3b6b27f
...
...
@@ -10,7 +10,7 @@ require(window.APT_OPTIONS.configObject,
'
js/lib/text!template/oops-modal.html
'
,
'
js/lib/text!template/share-modal.html
'
,
// jQuery modules
'
marked
'
,
'
jquery-ui
'
,
'
jquery-grid
'
],
'
marked
'
],
function
(
_
,
sup
,
moment
,
ppstart
,
showString
,
waitwaitString
,
rendererString
,
showtopoString
,
rspectextviewString
,
...
...
www/aptui/manage_profile.php
View file @
b3b6b27f
...
...
@@ -181,7 +181,9 @@ function SPITFORM($formfields, $errors)
echo
" window.SNAPUUID = '
$snapuuid
';
\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/bootstrap.js'></script>
\n
"
;
echo
"<script src='js/lib/require.js' data-main='js/manage_profile'>
...
...
www/aptui/show-dataset.php
View file @
b3b6b27f
...
...
@@ -163,7 +163,8 @@ echo " window.CANAPPROVE = $canapprove;\n";
echo
" window.CANREFRESH =
$canrefresh
;
\n
"
;
echo
" window.CANSNAPSHOT=
$cansnapshot
;
\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.
echo
"<link rel='stylesheet' href='css/progress.css'>
\n
"
;
echo
"<link rel='stylesheet' href='css/codemirror.css'>
\n
"
;
...
...
www/aptui/show-profile.php
View file @
b3b6b27f
...
...
@@ -118,7 +118,9 @@ echo "</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
();
?>
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment