From 0e5249f8d806df082e7bb2ce0cb0fd62b992bf45 Mon Sep 17 00:00:00 2001
From: Rene Saarsoo <nene@triin.net>
Date: Mon, 8 Aug 2011 14:07:08 +0300
Subject: [PATCH] Rename Docs.view.cls.Tree to Docs.view.DocTree.

It is now a base class and not specific to classtree.

Additionally create the tree nodes for examples and videos explicitly -
not simply applying some extra properties to existing data nodes.
---
 template/app/controller/Classes.js            | 2 +-
 template/app/controller/Tabs.js               | 2 +-
 template/app/view/{cls/Tree.js => DocTree.js} | 8 ++++----
 template/app/view/Viewport.js                 | 4 ++--
 template/app/view/examples/Tree.js            | 7 ++++---
 template/app/view/guides/Tree.js              | 2 +-
 template/app/view/videos/Tree.js              | 6 +++---
 template/resources/sass/viewport.scss         | 2 +-
 8 files changed, 17 insertions(+), 16 deletions(-)
 rename template/app/view/{cls/Tree.js => DocTree.js} (93%)

diff --git a/template/app/controller/Classes.js b/template/app/controller/Classes.js
index fb83075c..9cbc11b2 100644
--- a/template/app/controller/Classes.js
+++ b/template/app/controller/Classes.js
@@ -36,7 +36,7 @@ Ext.define('Docs.controller.Classes', {
         },
         {
             ref: 'tree',
-            selector: 'classtree'
+            selector: '#classtree'
         },
         {
             ref: 'favoritesGrid',
diff --git a/template/app/controller/Tabs.js b/template/app/controller/Tabs.js
index 2677a4f9..d20888e6 100644
--- a/template/app/controller/Tabs.js
+++ b/template/app/controller/Tabs.js
@@ -7,7 +7,7 @@ Ext.define('Docs.controller.Tabs', {
     refs: [
         {
             ref: 'classTree',
-            selector: 'classtree'
+            selector: '#classtree'
         },
         {
             ref: 'guideTree',
diff --git a/template/app/view/cls/Tree.js b/template/app/view/DocTree.js
similarity index 93%
rename from template/app/view/cls/Tree.js
rename to template/app/view/DocTree.js
index 6372840a..f0edbe08 100644
--- a/template/app/view/cls/Tree.js
+++ b/template/app/view/DocTree.js
@@ -1,11 +1,11 @@
 /**
- * The class tree
+ * The base tree class for classes/guides/videos/examples.
  */
-Ext.define('Docs.view.cls.Tree', {
+Ext.define('Docs.view.DocTree', {
     extend: 'Ext.tree.Panel',
-    alias : 'widget.classtree',
+    alias: 'widget.doctree',
 
-    cls: 'class-tree iScroll',
+    cls: 'doc-tree iScroll',
     useArrows: true,
     rootVisible: false,
 
diff --git a/template/app/view/Viewport.js b/template/app/view/Viewport.js
index bcd12db1..b3ec4569 100644
--- a/template/app/view/Viewport.js
+++ b/template/app/view/Viewport.js
@@ -9,7 +9,7 @@ Ext.define('Docs.view.Viewport', {
         'Docs.view.index.Welcome',
         'Docs.view.cls.Index',
         'Docs.view.cls.Container',
-        'Docs.view.cls.Tree',
+        'Docs.view.DocTree',
         'Docs.view.guides.Index',
         'Docs.view.guides.Tree',
         'Docs.view.videos.Index',
@@ -78,7 +78,7 @@ Ext.define('Docs.view.Viewport', {
                         width: 240,
                         items: [
                             {
-                                xtype: 'classtree',
+                                xtype: 'doctree',
                                 id: 'classtree',
                                 root: Docs.data.classes
                             },
diff --git a/template/app/view/examples/Tree.js b/template/app/view/examples/Tree.js
index 8d20e14d..3f006bf2 100644
--- a/template/app/view/examples/Tree.js
+++ b/template/app/view/examples/Tree.js
@@ -2,7 +2,7 @@
  * The examples tree
  */
 Ext.define('Docs.view.examples.Tree', {
-    extend: 'Docs.view.cls.Tree',
+    extend: 'Docs.view.DocTree',
     alias: 'widget.exampletree',
 
     initComponent: function() {
@@ -14,11 +14,12 @@ Ext.define('Docs.view.examples.Tree', {
 
         Ext.Array.each(Docs.data.examples, function(group) {
             var children = Ext.Array.map(group.items, function(sample) {
-                return Ext.apply(sample, {
+                return {
                     leaf: true,
+                    text: sample.text,
                     url: '/example/' + sample.url,
                     iconCls: 'icon-example'
-                });
+                };
             });
 
             this.root.children.push({
diff --git a/template/app/view/guides/Tree.js b/template/app/view/guides/Tree.js
index 7cb875b6..35efe1e1 100644
--- a/template/app/view/guides/Tree.js
+++ b/template/app/view/guides/Tree.js
@@ -2,7 +2,7 @@
  * The guides tree
  */
 Ext.define('Docs.view.guides.Tree', {
-    extend: 'Docs.view.cls.Tree',
+    extend: 'Docs.view.DocTree',
     alias: 'widget.guidetree',
 
     initComponent: function() {
diff --git a/template/app/view/videos/Tree.js b/template/app/view/videos/Tree.js
index 01305253..1bc1e42f 100644
--- a/template/app/view/videos/Tree.js
+++ b/template/app/view/videos/Tree.js
@@ -2,7 +2,7 @@
  * The videos tree
  */
 Ext.define('Docs.view.videos.Tree', {
-    extend: 'Docs.view.cls.Tree',
+    extend: 'Docs.view.DocTree',
     alias: 'widget.videotree',
 
     initComponent: function() {
@@ -14,12 +14,12 @@ Ext.define('Docs.view.videos.Tree', {
 
         Ext.Array.each(Docs.data.videos, function(group, idx) {
             var children = Ext.Array.map(group.items, function(video) {
-                return Ext.apply(video, {
+                return {
                     leaf: true,
                     text: video.title,
                     url: '/video/' + video.id,
                     iconCls: 'icon-video'
-                });
+                };
             });
 
             this.root.children.push({
diff --git a/template/resources/sass/viewport.scss b/template/resources/sass/viewport.scss
index 17349e0e..51c315f5 100644
--- a/template/resources/sass/viewport.scss
+++ b/template/resources/sass/viewport.scss
@@ -249,7 +249,7 @@ a {
     border-width: 1px 0; } }
 
 // Use normal color for class-links in tree
-.class-tree {
+.doc-tree {
   .docClass, .docClass:hover {
     color: #000; } }
 
-- 
GitLab