Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
X
xnat-web
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
dhcp
xnat-web
Commits
8563e483
Commit
8563e483
authored
8 years ago
by
Mark M. Florida
Browse files
Options
Downloads
Patches
Plain Diff
Fixed function name.
parent
c1dfa24a
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/main/webapp/scripts/xnat/ui/popup.js
+7
-8
7 additions, 8 deletions
src/main/webapp/scripts/xnat/ui/popup.js
with
7 additions
and
8 deletions
src/main/webapp/scripts/xnat/ui/popup.js
+
7
−
8
View file @
8563e483
...
@@ -7,9 +7,8 @@ var XNAT = getObject(XNAT||{});
...
@@ -7,9 +7,8 @@ var XNAT = getObject(XNAT||{});
(
function
(
XNAT
){
(
function
(
XNAT
){
var
popup
,
var
popup
,
window
=
this
,
window
=
this
;
xurl
=
getObject
(
XNAT
.
url
||
{});
// base popup function
// base popup function
function
popupCentered
(
/* url, title, w, h, y, params */
)
{
function
popupCentered
(
/* url, title, w, h, y, params */
)
{
...
@@ -91,8 +90,8 @@ var XNAT = getObject(XNAT||{});
...
@@ -91,8 +90,8 @@ var XNAT = getObject(XNAT||{});
// is the current window or 'loc' an XNAT popup?
// is the current window or 'loc' an XNAT popup?
function
isPopup
(
loc
){
function
isPopup
(
loc
){
loc
=
x
url
.
splitUrl
(
loc
||
window
.
location
.
href
);
loc
=
XNAT
.
url
.
splitUrl
(
loc
||
window
.
location
.
href
);
return
(
loc
.
base
.
indexOf
(
'
popup/true
'
)
>
-
1
||
x
url
.
get
Param
(
'
popup
'
)
===
'
true
'
)
return
(
loc
.
base
.
indexOf
(
'
popup/true
'
)
>
-
1
||
XNAT
.
url
.
get
QueryStringValue
(
'
popup
'
)
===
'
true
'
)
}
}
// save popup status for global usage
// save popup status for global usage
window
.
isPopup
=
isPopup
();
window
.
isPopup
=
isPopup
();
...
@@ -101,10 +100,10 @@ var XNAT = getObject(XNAT||{});
...
@@ -101,10 +100,10 @@ var XNAT = getObject(XNAT||{});
// process a url to add the 'popup' parts
// process a url to add the 'popup' parts
function
setupUrl
(
fullUrl
){
function
setupUrl
(
fullUrl
){
var
urlParts
=
x
url
.
splitUrl
(
fullUrl
),
var
urlParts
=
XNAT
.
url
.
splitUrl
(
fullUrl
),
newUrl
=
x
url
.
updateBase
(
fullUrl
,
urlParts
.
base
.
replace
(
/
(\/
popup
\/(
false|true
))
|
(\/
+$
)
/g
,
''
)
+
'
/popup/true
'
);
newUrl
=
XNAT
.
url
.
updateBase
(
fullUrl
,
urlParts
.
base
.
replace
(
/
(\/
popup
\/(
false|true
))
|
(\/
+$
)
/g
,
''
)
+
'
/popup/true
'
);
return
x
url
.
addQueryString
(
newUrl
,
'
?popup=true
'
)
return
XNAT
.
url
.
addQueryString
(
newUrl
,
'
?popup=true
'
)
}
}
popup
.
setupUrl
=
setupUrl
;
popup
.
setupUrl
=
setupUrl
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment