Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
Edirom-Online
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Deploy
Releases
Package registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Issue analytics
Insights
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
Edirom
Edirom-Online
Commits
c18ce672
Commit
c18ce672
authored
7 years ago
by
Nikolaos Beer
Committed by
GitHub
7 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #96 from Edirom/feature-edition-url-param
Edition param for activeEdition
parents
b36811d1
cd8eda54
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!126
Merge for version 0.10.0
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
app/Application.js
+13
-1
13 additions, 1 deletion
app/Application.js
with
13 additions
and
1 deletion
app/Application.js
+
13
−
1
View file @
c18ce672
...
@@ -66,6 +66,10 @@ Ext.define('EdiromOnline.Application', {
...
@@ -66,6 +66,10 @@ Ext.define('EdiromOnline.Application', {
me
.
addEvents
(
'
workSelected
'
);
me
.
addEvents
(
'
workSelected
'
);
var
editionParam
=
me
.
getURLParameter
(
'
edition
'
);
if
(
editionParam
!==
null
)
me
.
activeEdition
=
editionParam
;
Ext
.
Ajax
.
request
({
Ext
.
Ajax
.
request
({
url
:
'
data/xql/getEditionURI.xql
'
,
url
:
'
data/xql/getEditionURI.xql
'
,
async
:
false
,
async
:
false
,
...
@@ -78,6 +82,10 @@ Ext.define('EdiromOnline.Application', {
...
@@ -78,6 +82,10 @@ Ext.define('EdiromOnline.Application', {
scope
:
this
scope
:
this
});
});
var
workParam
=
me
.
getURLParameter
(
'
work
'
);
if
(
workParam
!==
null
)
me
.
activeWork
=
workParam
;
Ext
.
Ajax
.
request
({
Ext
.
Ajax
.
request
({
url
:
'
data/xql/getWorkID.xql
'
,
url
:
'
data/xql/getWorkID.xql
'
,
async
:
false
,
async
:
false
,
...
@@ -131,5 +139,9 @@ Ext.define('EdiromOnline.Application', {
...
@@ -131,5 +139,9 @@ Ext.define('EdiromOnline.Application', {
var
edition
=
editions
.
getAt
(
editionIndex
);
var
edition
=
editions
.
getAt
(
editionIndex
);
edition
[
fnName
](
callback
,
arguments
);
edition
[
fnName
](
callback
,
arguments
);
}
},
getURLParameter
:
function
(
parameter
)
{
return
decodeURIComponent
((
new
RegExp
(
'
[?|&]
'
+
parameter
+
'
=
'
+
'
([^&;]+?)(&|#|;|$)
'
).
exec
(
location
.
search
)
||
[
null
,
''
])[
1
].
replace
(
/
\+
/g
,
'
%20
'
))
||
null
;
}
});
});
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