Sort the language order in language tags

hackjutsu · Jan 18, 2017 · e179d01 · e179d01
1 parent f223b06
commit e179d01
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 49 deletions.
diff --git a/app/containers/navigationPanel/index.js b/app/containers/navigationPanel/index.js
@@ -19,18 +19,16 @@ class NavigationPanel extends Component {
     let activeLangTag = this.props.activeLangTag
     let tagList = []
 
-    for (let lang in langTags) {
-      if (langTags.hasOwnProperty(lang)) {
-        tagList.push(
-          <div key={ lang }>
-            <a className={ lang === activeLangTag ? 'active-lang-tag' : 'lang-tag' }
-              onClick={ this.handleClicked.bind(this, lang) }>
-              { '#' + lang }
-            </a>
-          </div>
-        )
-      }
-    }
+    Object.keys(langTags).sort().forEach(lang => {
+      tagList.push(
+        <div key={ lang }>
+          <a className={ lang === activeLangTag ? 'active-lang-tag' : 'lang-tag' }
+            onClick={ this.handleClicked.bind(this, lang) }>
+            { '#' + lang }
+          </a>
+        </div>
+      )
+    })
 
     return tagList
   } // renderTags()

diff --git a/app/containers/snippet/index.js b/app/containers/snippet/index.js
@@ -110,21 +110,19 @@ class Snippet extends Component {
     // exist, we should add the new language to langTags.
     let newLangs = new Set()
     let langTags = this.props.langTags
-    for (let key in files) {
-      if (files.hasOwnProperty(key)) {
-        let file = files[key]
-        let language = file.language
-        newLangs.add(language)
-        if (langTags.hasOwnProperty(language)) {
-          if (langTags[language].indexOf(gistId) === -1) {
-            langTags[language].unshift(gistId)
-          }
-        } else {
-          langTags[language] = []
+    Object.keys(files).forEach(filename => {
+      let file = files[filename]
+      let language = file.language
+      newLangs.add(language)
+      if (langTags.hasOwnProperty(language)) {
+        if (langTags[language].indexOf(gistId) === -1) {
           langTags[language].unshift(gistId)
         }
+      } else {
+        langTags[language] = []
+        langTags[language].unshift(gistId)
       }
-    }
+    })
 
     logger.debug('Filtering out the outdated gistId in the langTags')
     // Removing files in an eidt could introduce some changes to the langTags.

diff --git a/app/containers/userPanel/index.js b/app/containers/userPanel/index.js
@@ -150,19 +150,17 @@ class UserPanel extends Component {
     let langs = new Set()
     let langTags = this.props.langTags
     langTags.All.unshift(gistId)
-    for (let key in files) {
-      if (files.hasOwnProperty(key)) {
-        let file = files[key]
-        let language = file.language
-        langs.add(language)
-        if (langTags.hasOwnProperty(language)) {
-          langTags[language].unshift(gistId)
-        } else {
-          langTags[language] = []
-          langTags[language].unshift(gistId)
-        }
+    Object.keys(files).forEach(filename => {
+      let file = files[filename]
+      let language = file.language
+      langs.add(language)
+      if (langTags.hasOwnProperty(language)) {
+        langTags[language].unshift(gistId)
+      } else {
+        langTags[language] = []
+        langTags[language].unshift(gistId)
       }
-    }
+    })
 
     let newGist = {}
     newGist[gistId] = {

diff --git a/app/index.js b/app/index.js
@@ -204,20 +204,18 @@ function updateUserGists (userLoginId, accessToken) {
       gistList.forEach((gist) => {
         let langs = new Set()
 
-        for (let key in gist.files) {
-          if (gist.files.hasOwnProperty(key)) {
-            let file = gist.files[key]
-            let language = file.language
-            langs.add(language)
-            rawLangTags['All'].add(gist.id)
-            if (rawLangTags.hasOwnProperty(language)) {
-              rawLangTags[language].add(gist.id)
-            } else {
-              rawLangTags[language] = new Set()
-              rawLangTags[language].add(gist.id)
-            }
+        Object.keys(gist.files).forEach(filename => {
+          let file = gist.files[filename]
+          let language = file.language
+          langs.add(language)
+          rawLangTags['All'].add(gist.id)
+          if (rawLangTags.hasOwnProperty(language)) {
+            rawLangTags[language].add(gist.id)
+          } else {
+            rawLangTags[language] = new Set()
+            rawLangTags[language].add(gist.id)
           }
-        }
+        })
 
         for (let language in rawLangTags) {
           // Save the gist ids in an Array rather than a Set, which facilitate