Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
minerva
core
Commits
5be718b2
Commit
5be718b2
authored
Jan 30, 2017
by
Piotr Gawron
Browse files
lint issues
parent
f3048f48
Changes
6
Hide whitespace changes
Inline
Side-by-side
frontend-js/package.json
View file @
5be718b2
...
...
@@ -12,7 +12,6 @@
"author"
:
"Piotr Gawron"
,
"devDependencies"
:
{
"assert"
:
"1.4.1"
,
"blob-util"
:
"^1.2.1"
,
"bluebird"
:
"^3.4.6"
,
"bootstrap"
:
"^3.3.7"
,
"browserify"
:
"^13.1.1"
,
...
...
frontend-js/src/main/js/gui/OverlayPanel.js
View file @
5be718b2
...
...
@@ -39,7 +39,7 @@ function OverlayPanel(params) {
}
else
{
self
.
getAddButtonElement
().
onclick
=
function
(){
self
.
openAddOverlayDialog
();
}
}
;
}
self
.
setCustomOverlaysMessage
(
self
.
getCustomOverlaysTitleElement
().
innerHTML
);
...
...
@@ -338,7 +338,7 @@ OverlayPanel.prototype.parseFile = function(fileContent) {
OverlayPanel
.
prototype
.
openAddOverlayDialog
=
function
()
{
var
self
=
this
;
var
fileContent
=
null
;
return
new
Promise
(
function
(
resolve
,
reject
){
return
new
Promise
(
function
(
resolve
){
var
content
=
document
.
createElement
(
"
div
"
);
content
.
style
.
width
=
"
100%
"
;
...
...
@@ -377,10 +377,10 @@ OverlayPanel.prototype.openAddOverlayDialog = function() {
if
(
data
.
description
!==
undefined
)
{
descriptionInput
.
value
=
data
.
description
;
}
}
reader
.
onerror
=
function
(
evt
)
{
}
;
reader
.
onerror
=
function
()
{
GuiConnector
.
alert
(
"
Problem reading file
"
);
}
}
;
}
},
false
);
content
.
appendChild
(
fileInput
);
...
...
@@ -398,7 +398,7 @@ OverlayPanel.prototype.openAddOverlayDialog = function() {
description
:
descriptionInput
.
value
,
content
:
fileContent
,
filename
:
fileInput
.
value
}
}
;
return
ServerConnector
.
addOverlay
(
data
).
then
(
function
(){
return
self
.
refresh
();
}).
then
(
function
(){
...
...
frontend-js/src/main/js/gui/Panel.js
View file @
5be718b2
...
...
@@ -6,7 +6,6 @@ var GuiConnector = require('../GuiConnector');
var
ObjectWithListeners
=
require
(
'
../ObjectWithListeners
'
);
var
logger
=
require
(
'
../logger
'
);
var
fun
=
require
(
'
../Functions
'
);
function
Panel
(
params
)
{
ObjectWithListeners
.
call
(
this
,
params
);
...
...
frontend-js/src/test/js/gui/OverlayPanel-test.js
View file @
5be718b2
...
...
@@ -9,7 +9,6 @@ var OverlayPanel = require('../../../main/js/gui/OverlayPanel');
var
chai
=
require
(
'
chai
'
);
var
assert
=
chai
.
assert
;
var
logger
=
require
(
'
../logger
'
);
var
blobUtil
=
require
(
'
blob-util
'
);
describe
(
'
OverlayPanel
'
,
function
()
{
...
...
frontend-js/src/test/js/gui/Panel-test.js
View file @
5be718b2
"
use strict
"
;
/* exported logger */
var
Helper
=
require
(
'
../helper
'
);
require
(
"
../mocha-config.js
"
);
var
Alias
=
require
(
'
../../../main/js/map/data/Alias
'
);
var
Panel
=
require
(
'
../../../main/js/gui/Panel
'
);
var
chai
=
require
(
'
chai
'
);
...
...
frontend-js/src/test/js/mocha-config.js
View file @
5be718b2
...
...
@@ -17,7 +17,7 @@ global.$ = require('jQuery');
global
.
jQuery
=
$
;
global
.
window
.
$
=
$
;
require
(
'
jquery-ui-dist/jquery-ui.js
'
)
require
(
'
jquery-ui-dist/jquery-ui.js
'
)
;
require
(
"
bootstrap
"
);
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment