openstack
/
fuel-ui
Code Issues Proposed changes

Merge "Update Backbone to 1.2.1"

This commit is contained in:
Jenkins 2015-06-08 13:48:39 +00:00 committed by Gerrit Code Review
parent c00e8aab76 2d75d223c1
commit 9a480a2853
8 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bower.json
View File

@ -13,7 +13,7 @@
"routefilter": "0.2.1",
"lodash": "3.9.3",
"autoNumeric": "1.9.12",
"backbone": "1.1.2",
"backbone": "1.2.1",
"backbone.stickit": "0.9.2",
"i18next": "1.7.1",
"less": "2.4.0",

2
static/vendor/custom/react.backbone.js vendored
View File

@ -40,7 +40,7 @@
'use strict';
var collectionBehavior = {
changeOptions: 'add remove reset sort',
changeOptions: 'update reset sort',
updateScheduler: function(func) { return _.debounce(func, 0, {leading: true, trailing: true}); }
};

2
static/views/cluster_page.jsx
View File

@ -47,7 +47,7 @@ function($, _, i18n, Backbone, React, utils, models, dispatcher, componentMixins
}),
componentMixins.backboneMixin({
modelOrCollection: function(props) {return props.cluster.get('tasks');},
renderOn: 'add remove change'
renderOn: 'update change'
}),
componentMixins.dispatcherMixin('networkConfigurationUpdated', 'removeFinishedNetworkTasks'),
componentMixins.dispatcherMixin('deploymentTasksUpdated', 'removeFinishedDeploymentTasks'),

8
static/views/cluster_page_tabs/healthcheck_tab.jsx
View File

@ -32,7 +32,7 @@ function($, _, i18n, Backbone, React, models, utils, componentMixins, controls)
mixins: [
componentMixins.backboneMixin({
modelOrCollection: function(props) {return props.cluster.get('tasks');},
renderOn: 'add remove change:status'
renderOn: 'update change:status'
}),
componentMixins.backboneMixin('cluster', 'change:status')
],
@ -102,9 +102,9 @@ function($, _, i18n, Backbone, React, models, utils, componentMixins, controls)
var HealthcheckTabContent = React.createClass({
mixins: [
componentMixins.backboneMixin('tests', 'add remove change'),
componentMixins.backboneMixin('testsets', 'add remove change:checked'),
componentMixins.backboneMixin('testruns', 'add remove change'),
componentMixins.backboneMixin('tests', 'update change'),
componentMixins.backboneMixin('testsets', 'update change:checked'),
componentMixins.backboneMixin('testruns', 'update change'),
componentMixins.pollingMixin(3)
],
shouldDataBeFetched: function() {

2
static/views/cluster_page_tabs/network_tab.jsx
View File

@ -484,7 +484,7 @@ function($, _, i18n, Backbone, React, models, dispatcher, utils, componentMixins
modelOrCollection: function(props) {
return props.cluster.get('tasks');
},
renderOn: 'add remove change:status'
renderOn: 'update change:status'
}),
componentMixins.dispatcherMixin('hideNetworkVerificationResult', function() {
this.setState({hideVerificationResult: true});

8
static/views/cluster_page_tabs/nodes_tab_screens/node_list_screen.jsx
View File

@ -35,10 +35,10 @@ function($, _, i18n, Backbone, React, utils, models, dispatcher, controls, dialo
mixins: [
componentMixins.pollingMixin(20, true),
componentMixins.backboneMixin('cluster', 'change:status'),
componentMixins.backboneMixin('nodes', 'add remove change'),
componentMixins.backboneMixin('nodes', 'update change'),
componentMixins.backboneMixin({
modelOrCollection: function(props) {return props.cluster.get('tasks');},
renderOn: 'add remove change:status'
renderOn: 'update change:status'
})
],
getInitialState: function() {
@ -103,12 +103,12 @@ function($, _, i18n, Backbone, React, utils, models, dispatcher, controls, dialo
};
}
this.updateInitialRoles();
this.props.nodes.on('add remove reset', this.updateInitialRoles, this);
this.props.nodes.on('update reset', this.updateInitialRoles, this);
// hack to prevent node roles update after node polling
if (this.props.mode != 'list') this.props.nodes.on('change:pending_roles', this.checkRoleAssignment, this);
},
componentWillUnmount: function() {
this.props.nodes.off('add remove reset', this.updateInitialRoles, this);
this.props.nodes.off('update reset', this.updateInitialRoles, this);
this.props.nodes.off('change:pending_roles', this.checkRoleAssignment, this);
},
processRoleLimits: function() {

2
static/views/dialogs.jsx
View File

@ -198,7 +198,7 @@ function($, _, i18n, Backbone, React, utils, models, dispatcher, controls, compo
modelOrCollection: function(props) {
return props.cluster.get('tasks');
},
renderOn: 'add remove change:status'
renderOn: 'update change:status'
})
],
getDefaultProps: function() {return {title: i18n('dialog.display_changes.title')};},

2
static/views/layout.jsx
View File

@ -38,7 +38,7 @@ function($, _, i18n, Backbone, React, utils, models, controls, componentMixins,
componentMixins.backboneMixin('user'),
componentMixins.backboneMixin('version'),
componentMixins.backboneMixin('statistics'),
componentMixins.backboneMixin('notifications', 'add remove change:status'),
componentMixins.backboneMixin('notifications', 'update change:status'),
componentMixins.pollingMixin(20)
],
togglePopover: function(popoverName) {