odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] Avoid reserved keywords as method names 

bzr revid: ddm@openerp.com-20131121114922-w731pvjnnvqzxu42
This commit is contained in:
ddm 2013-11-21 12:49:22 +01:00
parent 135345bf2a
commit 56e19c374f
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/website/static/src/js/website.tour.banner.js
View File

@ -127,7 +127,7 @@
];
return this._super();
},
continue: function () {
resume: function () {
return (this.isCurrentStep('part-2') || this.isCurrentStep('show-tutorials')) && !this.tour.ended();
},
});

4
addons/website/static/src/js/website.tour.js
View File

@ -27,7 +27,7 @@
$('.popover.tour').remove();
},
start: function () {
if (this.continue() || ((this.currentStepIndex() === 0) && !this.tour.ended())) {
if (this.resume() || ((this.currentStepIndex() === 0) && !this.tour.ended())) {
this.tour.start();
}
},
@ -68,7 +68,7 @@
window.location.replace(newUrl);
}
},
continue: function () {
resume: function () {
// Override if necessary
return this.currentStepIndex() === 0;
},

4
addons/website_blog/static/src/js/website.tour.blog.js
View File

@ -107,11 +107,11 @@
];
return this._super();
},
continue: function () {
resume: function () {
return this.isCurrentStep('post-page') && !this.tour.ended();
},
trigger: function () {
return (this.continue() && this.testUrl(/^\/blog\/[0-9]+\/\?enable_editor=1/)) || this._super();
return (this.resume() && this.testUrl(/^\/blog\/[0-9]+\/\?enable_editor=1/)) || this._super();
},
});

4
addons/website_event/static/src/js/website.tour.event.js
View File

@ -74,11 +74,11 @@
];
return this._super();
},
continue: function () {
resume: function () {
return this.isCurrentStep('event-page') && !this.tour.ended();
},
trigger: function () {
return (this.continue() && this.testUrl(/^\/event\/[0-9]+\/\?enable_editor=1/)) || this._super();
return (this.resume() && this.testUrl(/^\/event\/[0-9]+\/\?enable_editor=1/)) || this._super();
},
});

4
addons/website_sale/static/src/js/website.tour.shop.js
View File

@ -83,11 +83,11 @@
];
return this._super();
},
continue: function () {
resume: function () {
return this.isCurrentStep('product-page') && !this.tour.ended();
},
trigger: function (url) {
return (this.continue() && this.testUrl(/^\/shop\/product\/[0-9]+\/\?enable_editor=1/)) || this._super();
return (this.resume() && this.testUrl(/^\/shop\/product\/[0-9]+\/\?enable_editor=1/)) || this._super();
},
});