From: ddm <ddm@openerp.com>
Date: Thu, 21 Nov 2013 11:49:22 +0000 (+0100)
Subject: [FIX] Avoid reserved keywords as method names
X-Git-Tag: InsPy_master01~73^2~825
X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=56e19c374f7a64197b183dc81d80194ceb3e0f90;p=odoo%2Fodoo.git

[FIX] Avoid reserved keywords as method names

bzr revid: ddm@openerp.com-20131121114922-w731pvjnnvqzxu42
---

diff --git a/addons/website/static/src/js/website.tour.banner.js b/addons/website/static/src/js/website.tour.banner.js
index f9b1fe1..5e82611 100644
--- a/addons/website/static/src/js/website.tour.banner.js
+++ b/addons/website/static/src/js/website.tour.banner.js
@@ -127,7 +127,7 @@
             ];
             return this._super();
         },
-        continue: function () {
+        resume: function () {
             return (this.isCurrentStep('part-2') || this.isCurrentStep('show-tutorials')) && !this.tour.ended();
         },
     });
diff --git a/addons/website/static/src/js/website.tour.js b/addons/website/static/src/js/website.tour.js
index 64f9734..8cefecb 100644
--- a/addons/website/static/src/js/website.tour.js
+++ b/addons/website/static/src/js/website.tour.js
@@ -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;
         },
diff --git a/addons/website_blog/static/src/js/website.tour.blog.js b/addons/website_blog/static/src/js/website.tour.blog.js
index 8ce3fb0..e524758 100644
--- a/addons/website_blog/static/src/js/website.tour.blog.js
+++ b/addons/website_blog/static/src/js/website.tour.blog.js
@@ -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();
         },
     });
 
diff --git a/addons/website_event/static/src/js/website.tour.event.js b/addons/website_event/static/src/js/website.tour.event.js
index 941a8c6..5d97c32 100644
--- a/addons/website_event/static/src/js/website.tour.event.js
+++ b/addons/website_event/static/src/js/website.tour.event.js
@@ -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();
         },
     });
 
diff --git a/addons/website_sale/static/src/js/website.tour.shop.js b/addons/website_sale/static/src/js/website.tour.shop.js
index 42f0645..835ccd9 100644
--- a/addons/website_sale/static/src/js/website.tour.shop.js
+++ b/addons/website_sale/static/src/js/website.tour.shop.js
@@ -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();
         },
     });