clean up

i09158knct · Mar 16, 2013 · 011fe92 · 011fe92
1 parent a766cee
commit 011fe92
Show file tree

Hide file tree

Showing 13 changed files with 42 additions and 41 deletions.
diff --git a/Gruntfile.coffee b/Gruntfile.coffee
@@ -13,9 +13,14 @@ module.exports = (grunt) ->
       coffee_build:
         files: ['<%= coffee.build.src %>', 'Gruntfile.coffee']
         tasks: ['coffee:build']
-        # tasks: ['coffee:build', 'copy:build']
       copy_build:
-        files: ['app/**/*.html', 'Gruntfile.coffee']
+        files: [
+          'app/**/*.html'
+          'app/**/*.js'
+          'app/**/*.css'
+          'app/**/*.png'
+          'Gruntfile.coffee'
+        ]
         tasks: ['copy:build']
       # coffee_test:
       #   files: ['<%= coffee.test.src %>', 'Gruntfile.coffee']

diff --git a/_site b/_site
diff --git a/app/index.html b/app/index.html
@@ -5,8 +5,6 @@
   <title>gist4gist</title>
   <link rel="stylesheet" href="css/bootstrap.min.css" media="all">
   <link rel="stylesheet" href="css/app.css" media="all">
-  <style>
-  </style>
   <script src="js/lib/require.js" data-main="js/main.js"></script>
 </head>
 <body>

diff --git a/app/js/main.coffee b/app/js/main.coffee
@@ -20,15 +20,9 @@ require.config
 require [
   'jquery'
   'routers/app'
-  'models/gist'
-  'views/gist'
-  'views/navbar'
   'lib/bootstrap.min'
-], ($, AppRouter, Gist, GistView, NavbarView) ->
+], ($, AppRouter) ->
   router = new AppRouter pushState: true
   Backbone.history.start()
 
-  window.Gist = Gist
-  window.GistView = GistView
-  window.NavbarView = NavbarView
   window.router = router
diff --git a/app/js/markdown-gist-parser.coffee b/app/js/markdown-gist-parser.coffee
@@ -28,6 +28,9 @@ define 'markdown-gist-parser', [
   getHead: (el) ->
     el: $(el).find('.gist-head')[0]
 
+  # ex. "filename.txt: [1, 2, 3]"
+  findNameAndLineNumbers: /\s*(.+)\s*:\s*(\[.*\])\s*$/
+
   # type TargetList = [{filename: [linenumber]}]
   # Element -> TargetList
   extractTargetList: (ul) ->
@@ -38,9 +41,6 @@ define 'markdown-gist-parser', [
       target[fileName] = JSON.parse lineNumbers
       target
 
-  # ex. "filename.txt: [1, 2, 3]"
-  findNameAndLineNumbers: /\s*(.+)\s*:\s*(\[.*\])\s*$/
-
   # Element -> [{"el": Element, "targetList": TargetList}]
   getSections: (el) ->
     $sections = $(el).find '.gist-section'

diff --git a/app/js/models/explanation.coffee b/app/js/models/explanation.coffee
@@ -2,9 +2,10 @@ define 'models/explanation', [
   'jquery'
   'underscore'
   'backbone'
-  'gist-loader'
   'markdown-gist-parser'
-], ($, _, Backbone, GistLoader, mdgParser) ->
+  'gist-loader'
+  # 'gist-loader-mock'
+], ($, _, Backbone, mdgParser, GistLoader) ->
   loader = new GistLoader()
 
   class Explanation extends Backbone.Model

diff --git a/app/js/models/gist.coffee b/app/js/models/gist.coffee
@@ -3,6 +3,7 @@ define 'models/gist', [
   'underscore'
   'backbone'
   'gist-loader'
+  # 'gist-loader-mock'
 ], ($, _, Backbone, GistLoader) ->
   loader = new GistLoader()
 

diff --git a/app/js/routers/app.coffee b/app/js/routers/app.coffee
@@ -11,19 +11,17 @@ define 'routers/app', [
       @prevId = null
 
     routes:
-      '(index)': 'index'
-      'new':   'new'
-      ':id(/(:number))':   'show'
+      '(index)':       'index'
+      ':id':           'show'
+      ':id/(:number)': 'show'
 
     index: () ->
       console.log 'index'
 
-    new: () ->
-      console.log 'new'
-
     show: (id, sectionNumber) ->
+      console.log 'show'
       if @prevId == id
         @app.render sectionNumber
       else
         @prevId = id
-        @app.changeGist id, sectionNumber
+        @app.changeGist id, sectionNumber
diff --git a/app/js/templates/explanation-section.html b/app/js/templates/explanation-section.html
@@ -2,8 +2,14 @@
   <li class="previous">
     <a href="#/<%- thisGistId %>/<%- currentSectionNumber - 1 %>">&larr; Previous</a>
   </li>
-  <li class="next<%- length < currentSectionNumber + 1 ? ' disabled' : '' %>">
-    <a href="#/<%- thisGistId %>/<%- currentSectionNumber + 1 %>">Next &rarr;</a>
-  </li>
+  <% if (length < currentSectionNumber + 1) { %>
+    <li class="next disabled">
+      <a href="#/<%- thisGistId %>/<%- currentSectionNumber %>">Next &rarr;</a>
+    </li>
+  <% } else { %>
+    <li class="next">
+      <a href="#/<%- thisGistId %>/<%- currentSectionNumber + 1 %>">Next &rarr;</a>
+    </li>
+  <% } %>
 </ul>
 <%= el.innerHTML %>
diff --git a/app/js/templates/gist.html b/app/js/templates/gist.html
@@ -4,9 +4,9 @@ <h1><a target="_blank" href="https://gist.github.com/<%- user.login %>"><%- user
 </p>
 <% for (var name in files) { %>
   <% var file = files[name] %>
-  <% var aaaaa = file.filename.replace(/\./g, '-') %>
-  <div class="file" id="gist-<%- aaaaa %>">
-    <h2><a target="_blank" href="<%- html_url %>#file-<%- aaaaa %>"><%- file.filename %></a></h2>
+  <% var idPrefix = file.filename.replace(/\./g, '-') %>
+  <div class="file" id="gist-<%- idPrefix %>">
+    <h2><a target="_blank" href="<%- html_url %>#file-<%- idPrefix %>"><%- file.filename %></a></h2>
     <ul>
       <li>Type: <%- file.type %></li>
       <li>Language: <%- file.language || '?' %></li>
@@ -22,7 +22,7 @@ <h2><a target="_blank" href="<%- html_url %>#file-<%- aaaaa %>"><%- file.filenam
             <pre><% for (lineNumber = 1; lineNumber <= lines.length; lineNumber++) { %><%= '<div>' + lineNumber + '</div>' %><% } %></pre>
           </td>
           <td width="100%" class="line-contents">
-            <pre><% for (lineNumber = 1; lineNumber <= lines.length; lineNumber++) { %><div id="<%- aaaaa + '-' + lineNumber %>"><%- lines[lineNumber - 1] %><%= lines[lineNumber - 1] ? '' : '<br>' %></div><% } %></pre>
+            <pre><% for (lineNumber = 1; lineNumber <= lines.length; lineNumber++) { %><div id="<%- idPrefix + '-' + lineNumber %>"><%- lines[lineNumber - 1] %><%= lines[lineNumber - 1] ? '' : '<br>' %></div><% } %></pre>
           </td>
         </tbody>
       </table>

diff --git a/app/js/views/app.coffee b/app/js/views/app.coffee
@@ -27,7 +27,6 @@ define 'views/app', [
       @explanation?.remove()
       @$('#app-message').text 'Loading...'
       Explanation.createAsync id, (explModel) =>
-        $('#app-message').text ''
         @explanation = new ExplanationView(model: explModel)
         targetId = explModel.getTargetId()
         Gist.createAsync targetId, (gistModel) =>

diff --git a/app/js/views/explanation.coffee b/app/js/views/explanation.coffee
@@ -24,14 +24,14 @@ define 'views/explanation', [
 
     renderSection: (sectionNumber) ->
       length = @model.get('sections').length
-      section = @model.getSection sectionNumber
-      {el, targetList} = section
+      sectionNumber = length if sectionNumber > length
+      {el, targetList} = @model.getSection sectionNumber
 
       for target in targetList
         for fileName, lines of target
-          aaaaa = fileName.replace /\./g, '-'
+          idPrefix = fileName.replace /\./g, '-'
           for line in lines
-            $("##{aaaaa}-#{line}").addClass 'highlighted'
+            $("##{idPrefix}-#{line}").addClass 'highlighted'
 
       @$el.html @sectionTemplate
         el: el
@@ -42,11 +42,10 @@ define 'views/explanation', [
 
     renderHead: () ->
       length = @model.get('sections').length
-      head = @model.getHead()
-      {el} = head
-      window.aa=el
+      {el} = @model.getHead()
+
       @$el.html @headTemplate
         el: el
         length: length
         thisGistId: @model.getGistId()
-      @
+      @
diff --git a/app/js/views/navbar.coffee b/app/js/views/navbar.coffee
@@ -16,4 +16,4 @@ define 'views/navbar', [
     cahangeGist: (event) ->
       event?.preventDefault()
       id = @$('#gist-id').val()
-      document.location.hash = '/' + id
+      document.location.hash = "/#{id}"