From fe000722b4680e3b0c755acb2a7979790080410e Mon Sep 17 00:00:00 2001 From: Rene Saarsoo Date: Tue, 28 Jun 2011 16:31:14 +0300 Subject: [PATCH] Unified naming of class/guide loading methods. This way all the methods are named similarly: - loadClass - loadGuide - loadIndex --- template/app/History.js | 4 ++-- template/app/controller/Classes.js | 10 +++++----- template/app/view/Viewport.js | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/template/app/History.js b/template/app/History.js index 632cb3a9..d9582424 100644 --- a/template/app/History.js +++ b/template/app/History.js @@ -21,10 +21,10 @@ Ext.define("Docs.History", { Docs.App.getController('Classes').loadClass(url.url, true); } else if (url.type === "guide") { - Docs.App.getController('Classes').showGuide(url.url, true); + Docs.App.getController('Classes').loadGuide(url.url, true); } else { - Docs.App.getController('Classes').showIndex(true); + Docs.App.getController('Classes').loadIndex(true); } }, diff --git a/template/app/controller/Classes.js b/template/app/controller/Classes.js index 2a31177a..c357256d 100644 --- a/template/app/controller/Classes.js +++ b/template/app/controller/Classes.js @@ -133,7 +133,7 @@ Ext.define('Docs.controller.Classes', { this.loadClass(url); } else { - this.showGuide(url); + this.loadGuide(url); } } }, @@ -152,7 +152,7 @@ Ext.define('Docs.controller.Classes', { * * @param {Boolean} noHistory true to disable adding entry to browser history */ - showIndex: function(noHistory) { + loadIndex: function(noHistory) { this.activeUrl = ""; if (!noHistory) { Docs.History.push(""); @@ -208,7 +208,7 @@ Ext.define('Docs.controller.Classes', { }, showClass: function(cls, anchor) { - if (this.currentCls != cls) { + if (this.currentCls !== cls) { this.getViewport().setPageTitle(cls.name); this.getHeader().load(cls); this.getOverview().load(cls); @@ -237,7 +237,7 @@ Ext.define('Docs.controller.Classes', { * @param {String} url URL of the guide * @param {Boolean} noHistory true to disable adding entry to browser history */ - showGuide: function(url, noHistory) { + loadGuide: function(url, noHistory) { if (this.activeUrl === url) return; this.activeUrl = url; @@ -265,8 +265,8 @@ Ext.define('Docs.controller.Classes', { /** * Displays page with 404 error message. - * * @param {String} msg + * @private */ showFailure: function(msg) { this.getOverview().setLoading(false); diff --git a/template/app/view/Viewport.js b/template/app/view/Viewport.js index db6a6c40..1010ed52 100644 --- a/template/app/view/Viewport.js +++ b/template/app/view/Viewport.js @@ -44,7 +44,7 @@ Ext.define('Docs.view.Viewport', { ui: 'hmm', listeners: { click: function() { - Docs.App.getController('Classes').showIndex(); + Docs.App.getController('Classes').loadIndex(); }, scope: this } -- GitLab