You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by ij...@apache.org on 2014/07/01 18:11:54 UTC
svn commit: r1607129 - in
/jena/Experimental/jena-fuseki2/src/main/webapp/js/app:
models/dataset-stats.js views/dataset-info.js views/dataset-stats.js
views/tabbed-view-manager.js
Author: ijd
Date: Tue Jul 1 16:11:54 2014
New Revision: 1607129
URL: http://svn.apache.org/r1607129
Log:
Update stats numbers when returning to the dataset info tab
Modified:
jena/Experimental/jena-fuseki2/src/main/webapp/js/app/models/dataset-stats.js
jena/Experimental/jena-fuseki2/src/main/webapp/js/app/views/dataset-info.js
jena/Experimental/jena-fuseki2/src/main/webapp/js/app/views/dataset-stats.js
jena/Experimental/jena-fuseki2/src/main/webapp/js/app/views/tabbed-view-manager.js
Modified: jena/Experimental/jena-fuseki2/src/main/webapp/js/app/models/dataset-stats.js
URL: http://svn.apache.org/viewvc/jena/Experimental/jena-fuseki2/src/main/webapp/js/app/models/dataset-stats.js?rev=1607129&r1=1607128&r2=1607129&view=diff
==============================================================================
--- jena/Experimental/jena-fuseki2/src/main/webapp/js/app/models/dataset-stats.js (original)
+++ jena/Experimental/jena-fuseki2/src/main/webapp/js/app/models/dataset-stats.js Tue Jul 1 16:11:54 2014
@@ -68,6 +68,17 @@ define(
return this.stats().datasets;
},
+ /** Reload the numbers from the server */
+ refresh: function() {
+ var self = this;
+
+ this.get( "dataset" )
+ .statistics()
+ .done( function( data ) {
+ self.set( "stats", data );
+ } );
+ },
+
// internal methods
collectEndpoints: function( ds ) {
Modified: jena/Experimental/jena-fuseki2/src/main/webapp/js/app/views/dataset-info.js
URL: http://svn.apache.org/viewvc/jena/Experimental/jena-fuseki2/src/main/webapp/js/app/views/dataset-info.js?rev=1607129&r1=1607128&r2=1607129&view=diff
==============================================================================
--- jena/Experimental/jena-fuseki2/src/main/webapp/js/app/views/dataset-info.js (original)
+++ jena/Experimental/jena-fuseki2/src/main/webapp/js/app/views/dataset-info.js Tue Jul 1 16:11:54 2014
@@ -12,7 +12,7 @@ define(
var DatasetInfo = Backbone.Marionette.ItemView.extend( {
initialize: function() {
- _.bindAll( this, "onShowTab" );
+// _.bindAll( this, "onShowTab" );
var dataset = this.dataset();
@@ -33,7 +33,6 @@ define(
el: "#info .with-dataset",
events: {
- "shown.bs.tab": "onShowTab"
},
templateHelpers: {
@@ -46,13 +45,10 @@ define(
/** Alias for the model */
dataset: function() {
return this.model;
- },
+ }
// event handlers
- onShowTab: function( e ) {
- var tab = $(e.target);
- }
});
Modified: jena/Experimental/jena-fuseki2/src/main/webapp/js/app/views/dataset-stats.js
URL: http://svn.apache.org/viewvc/jena/Experimental/jena-fuseki2/src/main/webapp/js/app/views/dataset-stats.js?rev=1607129&r1=1607128&r2=1607129&view=diff
==============================================================================
--- jena/Experimental/jena-fuseki2/src/main/webapp/js/app/views/dataset-stats.js (original)
+++ jena/Experimental/jena-fuseki2/src/main/webapp/js/app/views/dataset-stats.js Tue Jul 1 16:11:54 2014
@@ -6,7 +6,10 @@ define(
datasetStatsViewTpl = require( "plugins/text!app/templates/dataset-stats.tpl" );
var DatasetStatsView = Backbone.Marionette.ItemView.extend( {
- initialize: function(){
+ initialize: function() {
+ _.bindAll( this, "onShowTab" );
+
+ fui.vent.on( "shown.bs.tab", this.onShowTab );
},
template: _.template( datasetStatsViewTpl ),
@@ -22,7 +25,14 @@ define(
modelChanged: function() {
this.render();
+ },
+
+ onShowTab: function( tab ) {
+ if (tab.attr("href") === "#info") {
+ this.model.refresh();
+ }
}
+
});
Modified: jena/Experimental/jena-fuseki2/src/main/webapp/js/app/views/tabbed-view-manager.js
URL: http://svn.apache.org/viewvc/jena/Experimental/jena-fuseki2/src/main/webapp/js/app/views/tabbed-view-manager.js?rev=1607129&r1=1607128&r2=1607129&view=diff
==============================================================================
--- jena/Experimental/jena-fuseki2/src/main/webapp/js/app/views/tabbed-view-manager.js (original)
+++ jena/Experimental/jena-fuseki2/src/main/webapp/js/app/views/tabbed-view-manager.js Tue Jul 1 16:11:54 2014
@@ -25,6 +25,10 @@ define(
if (!this._firstRender) {
this._firstRender = true;
this.activateCurrentTab();
+
+ $(".nav-tabs").on( "shown.bs.tab", function( e ) {
+ fui.vent.trigger( "shown.bs.tab", $(e.target) );
+ } );
}
},