Commit f19dcd75 authored by Daniel van Asseldonk's avatar Daniel van Asseldonk
Browse files

Fixed bug in selector table view coming from old mergings

parent 3ad87e4f
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 = [ var fileMenuEntries = [
// "myIdKey": { // "myIdKey": {
// label: "My ID", // label: "My ID",
......
...@@ -50,14 +50,16 @@ define([ ...@@ -50,14 +50,16 @@ define([
"./selections", "./selections",
"./items", "./items",
"../base/views/symbol", "../base/views/symbol",
"./selectortableview" "../base/views/table",
// "./selectortableview"
], function( ], function(
FileBase, FileBase,
FileSelectorActions, FileSelectorActions,
FileSelectorSelections, FileSelectorSelections,
FileSelectorItems, FileSelectorItems,
SymbolView, SymbolView,
SelectorTableView TableView
// SelectorTableView
) { ) {
var FileSelector = FileBase._extend({ var FileSelector = FileBase._extend({
...@@ -74,7 +76,8 @@ define([ ...@@ -74,7 +76,8 @@ define([
this.workflow.sort = args.sort !== undefined ? args.sort : this.workflow.sort; this.workflow.sort = args.sort !== undefined ? args.sort : this.workflow.sort;
this.workflow.reverse = args.reverse !== undefined ? args.reverse : this.workflow.reverse; 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) { refresh: function(content, sort, reverse) {
......
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;
});
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment