Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
core
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
External wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD 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
minerva
core
Commits
5df2032d
Commit
5df2032d
authored
7 years ago
by
Piotr Gawron
Browse files
Options
Downloads
Patches
Plain Diff
header added for export
parent
21f1a03f
No related branches found
No related tags found
1 merge request
!58
some refactoring giving additional Rest API functionlaity
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
frontend-js/src/main/js/Export.js
+30
-5
30 additions, 5 deletions
frontend-js/src/main/js/Export.js
frontend-js/src/main/js/minerva.js
+0
-1
0 additions, 1 deletion
frontend-js/src/main/js/minerva.js
web/src/main/webapp/export-new.xhtml
+2
-0
2 additions, 0 deletions
web/src/main/webapp/export-new.xhtml
with
32 additions
and
6 deletions
frontend-js/src/main/js/Export.js
+
30
−
5
View file @
5df2032d
...
...
@@ -2,11 +2,13 @@
var
Promise
=
require
(
"
bluebird
"
);
var
logger
=
require
(
'
./logger
'
);
var
CustomMapOptions
=
require
(
'
./map/CustomMapOptions
'
);
var
Functions
=
require
(
'
./
Functions
'
);
var
Header
=
require
(
'
./
gui/Header
'
);
var
ObjectWithListeners
=
require
(
'
./ObjectWithListeners
'
);
var
logger
=
require
(
'
./logger
'
);
var
Functions
=
require
(
'
./Functions
'
);
/**
* Default constructor.
*
...
...
@@ -15,17 +17,33 @@ var ObjectWithListeners = require('./ObjectWithListeners');
* creation
*/
function
Export
(
options
)
{
this
.
_controls
=
[];
var
self
=
this
;
if
(
!
(
options
instanceof
CustomMapOptions
))
{
options
=
new
CustomMapOptions
(
options
);
}
this
.
setProject
(
options
.
getProject
());
self
.
setProject
(
options
.
getProject
());
self
.
setElement
(
options
.
getElement
());
self
.
_createGui
();
}
Export
.
prototype
=
Object
.
create
(
ObjectWithListeners
.
prototype
);
Export
.
prototype
.
constructor
=
ObjectWithListeners
;
Export
.
prototype
.
_createGui
=
function
()
{
var
self
=
this
;
self
.
getElement
().
innerHTML
=
""
;
var
headerDiv
=
Functions
.
createElement
({
type
:
"
div
"
});
new
Header
({
element
:
headerDiv
,
customMap
:
null
,
project
:
self
.
getProject
(),
});
self
.
getElement
().
appendChild
(
headerDiv
);
}
Export
.
prototype
.
setProject
=
function
(
project
)
{
this
.
_project
=
project
;
};
...
...
@@ -33,4 +51,11 @@ Export.prototype.getProject = function() {
return
this
.
_project
;
};
Export
.
prototype
.
setElement
=
function
(
element
)
{
this
.
_element
=
element
;
};
Export
.
prototype
.
getElement
=
function
()
{
return
this
.
_element
;
};
module
.
exports
=
Export
;
This diff is collapsed.
Click to expand it.
frontend-js/src/main/js/minerva.js
+
0
−
1
View file @
5df2032d
...
...
@@ -567,7 +567,6 @@ function createExport(params) {
return
getProject
(
params
);
}).
then
(
function
(
project
)
{
params
.
setProject
(
project
);
var
element
=
params
.
getElement
();
return
new
Export
(
params
);
});
}
...
...
This diff is collapsed.
Click to expand it.
web/src/main/webapp/export-new.xhtml
+
2
−
0
View file @
5df2032d
...
...
@@ -9,6 +9,8 @@
<f:view
contentType=
"text/html"
>
<h:head>
<script
src=
"https://maps.google.com/maps/api/js?libraries=drawing&v=3.26"
type=
"text/javascript"
/>
<
script
src
=
"
https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js
"
type
=
"
text/javascript
"
/>
<
script
src
=
"
https://twitter.github.io/typeahead.js/releases/latest/typeahead.bundle.min.js
"
type
=
"
text/javascript
"
/>
...
...
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