diff --git a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/controllers/MainController.js b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/controllers/MainController.js index f1552a0aecec1bae521020b7e8868b270d09699f..16ef2d62469f55c336c0489fbb5461b5e1f74d20 100644 --- a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/controllers/MainController.js +++ b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/controllers/MainController.js @@ -521,22 +521,7 @@ function MainController(profile) { label : 'Position', property : 'position', sortable : true - }, { - label : "Options", - property : 'Options', - sortable : true, - render : function(data) { - return $("<button>").text("Button").click(function() { - alert("WORKS!"); - }); - }, - filter : function(data, filter) { - return false; - }, - sort : function(data1, data2, asc) { - return naturalSort(data1.identifier, data2.identifier); - } - } ]; + }]; var getDataList = function(callback) { var dataList = []; @@ -552,7 +537,11 @@ function MainController(profile) { callback(dataList); }; - var dataGrid = new DataGridController(localReference, searchDomainLabel + " Search Results", columns, getDataList); + var rowClick = function(e) { + window.alert("Open Data Set From with :" + e.data.permId); + } + + var dataGrid = new DataGridController(localReference, searchDomainLabel + " Search Results", columns, getDataList, rowClick); localReference.currentView = dataGrid; dataGrid.init($("#mainContainer")); history.pushState(null, "", ""); //History Push State diff --git a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/DataGrid/DataGridController.js b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/DataGrid/DataGridController.js index 44d71126d95cfab9ccda868293c1d52be0ddc887..036779791847fc1fe76785f2c3dcaf61e5371b10 100644 --- a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/DataGrid/DataGridController.js +++ b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/DataGrid/DataGridController.js @@ -14,9 +14,9 @@ * limitations under the License. */ -function DataGridController(mainController, title, columns, data) { +function DataGridController(mainController, title, columns, data, rowClickEventHandler) { this._mainController = mainController; - this._dataGridModel = new DataGridModel(title, columns, data); + this._dataGridModel = new DataGridModel(title, columns, data, rowClickEventHandler); this._dataGridView = new DataGridView(this, this._dataGridModel); this.init = function($container) { diff --git a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/DataGrid/DataGridModel.js b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/DataGrid/DataGridModel.js index 67753f04115fe25229ae8b49023239626c59a115..1a058a394966c4b56de5ef8181e88fd4cef95d2d 100644 --- a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/DataGrid/DataGridModel.js +++ b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/DataGrid/DataGridModel.js @@ -14,8 +14,9 @@ * limitations under the License. */ -function DataGridModel(title, columns, data) { +function DataGridModel(title, columns, data, rowClickEventHandler) { this.title = title; this.columns = columns; this.data = data; + this.rowClickEventHandler = rowClickEventHandler; } \ No newline at end of file diff --git a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/DataGrid/DataGridView.js b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/DataGrid/DataGridView.js index 17db9a4efa3364575fdb80dd3c5592e844facfe6..c48a39e57322c59789b5db4cb384192f2bfba8c0 100644 --- a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/DataGrid/DataGridView.js +++ b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/DataGrid/DataGridView.js @@ -20,6 +20,7 @@ function DataGridView(dataGridController, dataGridModel) { this.repaint = function($container) { $container.empty(); var grid = new Grid(this._dataGridModel.columns, this._dataGridModel.data); + grid.addRowClickListener(this._dataGridModel.rowClickEventHandler); $container.append($("<h1>").append(this._dataGridModel.title)); $container.append(grid.render()); }