Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
3pia
VISPA
VISPA web
Commits
f19dcd75
Commit
f19dcd75
authored
Jul 13, 2015
by
Daniel van Asseldonk
Browse files
Fixed bug in selector table view coming from old mergings
parent
3ad87e4f
Changes
3
Hide whitespace changes
Inline
Side-by-side
vispa/extensions/file/static/js/menuentries.js
View file @
f19dcd75
define
([
"
./base/views/symbol
"
,
"
./base/views/table
"
,
"
./selector/selectortableview
"
],
function
(
SymbolView
,
TableView
,
SelectorTableView
)
{
define
([
"
./base/views/symbol
"
,
"
./base/views/table
"
],
function
(
SymbolView
,
TableView
)
{
var
fileMenuEntries
=
[
// "myIdKey": {
// label: "My ID",
...
...
vispa/extensions/file/static/js/selector/selector.js
View file @
f19dcd75
...
...
@@ -50,14 +50,16 @@ define([
"
./selections
"
,
"
./items
"
,
"
../base/views/symbol
"
,
"
./selectortableview
"
"
../base/views/table
"
,
// "./selectortableview"
],
function
(
FileBase
,
FileSelectorActions
,
FileSelectorSelections
,
FileSelectorItems
,
SymbolView
,
SelectorTableView
TableView
// SelectorTableView
)
{
var
FileSelector
=
FileBase
.
_extend
({
...
...
@@ -74,7 +76,8 @@ define([
this
.
workflow
.
sort
=
args
.
sort
!==
undefined
?
args
.
sort
:
this
.
workflow
.
sort
;
this
.
workflow
.
reverse
=
args
.
reverse
!==
undefined
?
args
.
reverse
:
this
.
workflow
.
reverse
;
this
.
workflow
.
currentView
=
viewstring
==
"
Symbol
"
?
SymbolView
:
SelectorTableView
;
// this.workflow.currentView = viewstring == "Symbol" ? SymbolView : SelectorTableView;
this
.
workflow
.
currentView
=
viewstring
==
"
Symbol
"
?
SymbolView
:
TableView
;
},
refresh
:
function
(
content
,
sort
,
reverse
)
{
...
...
vispa/extensions/file/static/js/selector/selectortableview.js
deleted
100755 → 0
View file @
3ad87e4f
define
([
"
jquery
"
,
"
../base/views/table
"
],
function
(
$
,
TableView
)
{
var
SelectorTableView
=
TableView
.
_extend
({
render
:
function
()
{
var
self
=
this
;
this
.
instance
.
getTemplate
(
vispa
.
url
.
dynamic
(
"
html/table.html
"
),
function
(
error
,
template
)
{
// self.fileContentContainer.append(template);
self
.
template
=
template
;
if
(
self
.
FileBase
.
workflow
.
data
===
null
)
{
self
.
FileBase
.
updateView
();
}
else
{
self
.
FileBase
.
refresh
(
self
.
FileBase
.
workflow
.
data
);
}
});
}
});
return
SelectorTableView
;
});
Write
Preview
Supports
Markdown
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