Skip to content

Commit

Permalink
fix table filter
Browse files Browse the repository at this point in the history
  • Loading branch information
tuky committed Mar 13, 2013
1 parent 24425b0 commit 2f5b893
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 4 deletions.
2 changes: 2 additions & 0 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ task :default => :all

task :all => [COMPRESSED_OUTPUT_FILE, OUTPUT_FILE, CSS_FILE]

task :nice => [OUTPUT_FILE, CSS_FILE]

# javascript sources
Files = %w(lib/jquery/jquery.min.js
js/Build/Minifier/basic.js
Expand Down
2 changes: 0 additions & 2 deletions geotemco-min.js

This file was deleted.

11 changes: 10 additions & 1 deletion geotemco.js
Original file line number Diff line number Diff line change
Expand Up @@ -18992,6 +18992,7 @@ function MapGui(map, div, options, iid) {
// }

this.resize = function() {
debugger;
var w = this.container.offsetWidth;
var h = this.container.offsetHeight;
// this.mapWindow.style.width = w + "px";
Expand Down Expand Up @@ -20700,6 +20701,8 @@ function TimeGui(plot, div, options, iid) {
setCanvas();

this.resize = function(){
alert("hallo!");
debugger;
gui.timeplotDiv.style.width = (gui.container.offsetWidth - 32) + "px";
ctx.clearRect(0,0,gui.plotWindow.clientWidth, gui.plotWindow.clientHeight);
if( typeof plot.datasets != "undefined" ){
Expand Down Expand Up @@ -22345,6 +22348,7 @@ function TableWidget(core, div, options) {
TableWidget.prototype = {

initWidget : function(data) {
this.datasets = data;

$(this.gui.tabs).empty();
$(this.gui.input).empty();
Expand Down Expand Up @@ -22496,7 +22500,10 @@ TableWidget.prototype = {
},

filtering : function() {
this.core.triggerRefining(this.selection.objects);
for (var i = 0; i < this.datasets.length; i++) {
this.datasets[i].objects = this.selection.objects[i];
}
this.core.triggerRefining(this.datasets);
},

inverseFiltering : function() {
Expand Down Expand Up @@ -26080,6 +26087,7 @@ if ( typeof Publisher == 'undefined') {

this.Publish = function(topic, data, publisher) {
var subscribers = this.Get(topic);
debugger;
for (var i = 0; i < subscribers.length; i++) {
if (publisher == null || subscribers[i].client != publisher) {
subscribers[i].callback(data);
Expand Down Expand Up @@ -26184,6 +26192,7 @@ function WidgetWrapper() {
});

Publisher.Subscribe('resizeWidget', this, function() {
debugger;
if ( typeof wrapper.widget != 'undefined' && typeof wrapper.widget.gui != 'undefined' && typeof wrapper.widget.gui.resize != 'undefined' ) {
wrapper.widget.gui.resize();
}
Expand Down
6 changes: 5 additions & 1 deletion js/Table/TableWidget.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ function TableWidget(core, div, options) {
TableWidget.prototype = {

initWidget : function(data) {
this.datasets = data;

$(this.gui.tabs).empty();
$(this.gui.input).empty();
Expand Down Expand Up @@ -200,7 +201,10 @@ TableWidget.prototype = {
},

filtering : function() {
this.core.triggerRefining(this.selection.objects);
for (var i = 0; i < this.datasets.length; i++) {
this.datasets[i].objects = this.selection.objects[i];
}
this.core.triggerRefining(this.datasets);
},

inverseFiltering : function() {
Expand Down

0 comments on commit 2f5b893

Please sign in to comment.