Merge pull request #195 from fedwiki/next

Releasing Next version...
fedwiki · May 6, 2017 · c2b608f · c2b608f
2 parents 800a937 + 2311c23
commit c2b608f
Show file tree

Hide file tree

Showing 9 changed files with 49 additions and 85 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,5 @@
 language: node_js
 node_js:
-  - "0.12"
-  - "4"
   - "6"
   - "7"
 install:

diff --git a/lib/editor.coffee b/lib/editor.coffee
@@ -27,6 +27,7 @@ escape = (string) ->
 
 textEditor = ($item, item, option={}) ->
   console.log 'textEditor', item.id, option
+  return unless $('.editEnable').is(':visible')
 
   keydownHandler = (e) ->
 

diff --git a/lib/factory.coffee b/lib/factory.coffee
@@ -78,14 +78,15 @@ bind = ($item, item) ->
     syncEditAction()
 
   addReference = (data) ->
-    wiki.site(data.site).get "#{data-slug}.json", (remote) ->
-      item.type = 'reference'
-      item.site = data.site
-      item.slug = data.slug
-      item.title = remote.title || data.slug
-      item.text = synopsis remote
-      syncEditAction()
-      neighborhood.registerNeighbor item.site if item.site?
+    wiki.site(data.site).get "#{data.slug}.json", (err, remote) ->
+      if !err
+        item.type = 'reference'
+        item.site = data.site
+        item.slug = data.slug
+        item.title = remote.title || data.slug
+        item.text = synopsis remote
+        syncEditAction()
+        neighborhood.registerNeighbor item.site if item.site?
 
   addVideo = (video) ->
     item.type = 'video'

diff --git a/lib/legacy.coffee b/lib/legacy.coffee
@@ -205,12 +205,17 @@ $ ->
     $('.page').each (index, element) ->
       refresh.emitTwins $(element)
 
-  lineupActivity = require './lineupActivity'
-  $("<span class=menu> &nbsp; &equiv; &nbsp; </span>")
-    .css({"cursor":"pointer", "font-size": "120%"})
+  # $('.editEnable').is(':visible')
+  $("<span>&nbsp; wiki <span class=editEnable>✔︎</span> &nbsp; </span>")
+    .css({"cursor":"pointer"})
     .appendTo('footer')
     .click ->
-      dialog.open "Lineup Activity", lineupActivity.show()
+      $('.editEnable').toggle()
+      $('.page').each ->
+        $page = $(this)
+        pageObject = lineup.atKey $page.data('key')
+        refresh.rebuildPage pageObject, $page.empty()
+  $('.editEnable').toggle() unless isAuthenticated
 
   target.bind()
 

diff --git a/lib/lineupActivity.coffee b/lib/lineupActivity.coffee
diff --git a/lib/refresh.coffee b/lib/refresh.coffee
@@ -238,7 +238,7 @@ renderPageIntoPageElement = (pageObject, $page) ->
   $paper = $("<div class='paper' />")
   $page.append($paper)
   [$twins, $header, $story, $journal, $footer] = ['twins', 'header', 'story', 'journal', 'footer'].map (className) ->
-    $("<div />").addClass(className).appendTo($paper)
+    $("<div />").addClass(className).appendTo($paper) if className != 'journal' or $('.editEnable').is(':visible')
 
   emitHeader $header, $page, pageObject
   emitTimestamp $header, $page, pageObject
@@ -248,13 +248,14 @@ renderPageIntoPageElement = (pageObject, $page) ->
     $story.append $item
     plugin.do $item, item, done
 
-  pageObject.seqActions (each, done) ->
-    addToJournal $journal, each.separator if each.separator
-    addToJournal $journal, each.action
-    done()
+  if $('.editEnable').is(':visible')
+    pageObject.seqActions (each, done) ->
+      addToJournal $journal, each.separator if each.separator
+      addToJournal $journal, each.action
+      done()
 
   emitTwins $page
-  emitControls $journal
+  emitControls $journal if $('.editEnable').is(':visible')
   emitFooter $footer, pageObject
 
 
@@ -275,9 +276,10 @@ rebuildPage = (pageObject, $page) ->
   #STATE -- update url when adding new page, removing others
   state.setUrl()
 
-  initDragging $page
-  initMerging $page
-  initAddButton $page
+  if $('.editEnable').is(':visible')
+    initDragging $page 
+    initMerging $page
+    initAddButton $page
   $page
 
 buildPage = (pageObject, $page) ->

diff --git a/lib/siteAdapter.coffee b/lib/siteAdapter.coffee
@@ -37,15 +37,15 @@ findAdapter = (site) ->
     if sitePrefix[site]?
       done sitePrefix[site]
 
-    testURL = "//#{site}/favicon.png?testing"
+    testURL = "//#{site}/favicon.png"
     this.test testURL, (worked) ->
       if worked
         sitePrefix[site] = "//#{site}"
         done "//#{site}"
       else
         switch location.protocol
           when 'http:'
-            testURL = "https://#{site}/favicon.png?testing"
+            testURL = "https://#{site}/favicon.png"
             this.test testURL, (worked) ->
               if worked
                 sitePrefix[site] = "https://#{site}"
@@ -55,7 +55,7 @@ findAdapter = (site) ->
                 sitePrefix[site] = ""
                 done ""
           when 'https:'
-            testURL = "/proxy/#{site}/favicon.png?testing"
+            testURL = "/proxy/#{site}/favicon.png"
             this.test testURL, (worked) ->
               if worked
                 sitePrefix[site] = "/proxy/#{site}"
@@ -71,7 +71,7 @@ findAdapter = (site) ->
             done ""
 
 siteAdapter.local = {
-  flag: -> "/favicon.png?adapted"
+  flag: -> "/favicon.png"
   getURL: (route) -> "/#{route}"
   get: (route, done) ->
     console.log "wiki.local.get #{route}"
@@ -89,14 +89,14 @@ siteAdapter.local = {
 }
 
 siteAdapter.origin = {
-  flag: -> "/favicon.png?adapted"
+  flag: -> "/favicon.png"
   getURL: (route) -> "/#{route}"
   get: (route, done) ->
     console.log "wiki.origin.get #{route}"
     $.ajax
       type: 'GET'
       dataType: 'json'
-      url: "/#{route}?adapted"
+      url: "/#{route}"
       success: (page) -> done null, page
       error: (xhr, type, msg) -> done {msg, xhr}, null
   put: (route, data, done) ->
@@ -148,7 +148,7 @@ siteAdapter.site = (site) ->
           tempFlags[site]
         else
           # we already know how to construct flag url
-          sitePrefix[site] + "/favicon.png?adapted"
+          sitePrefix[site] + "/favicon.png"
       else if tempFlags[site]?
         # we already have a temp. flag
         console.log "wiki.site(#{site}).flag - have temp. flag"
@@ -163,7 +163,7 @@ siteAdapter.site = (site) ->
             console.log "Prefix for #{site} is #{prefix}"
             # replace temp flags
             tempFlag = tempFlags[site]
-            realFlag = sitePrefix[site] + "/favicon.png?replaceTemp"
+            realFlag = sitePrefix[site] + "/favicon.png"
             # replace temporary flag where it is used as an image
             $('img[src="' + tempFlag + '"]').attr('src', realFlag)
             # replace temporary flag where its used as a background to fork event in journal
@@ -208,9 +208,9 @@ siteAdapter.site = (site) ->
       if sitePrefix[site]?
         if sitePrefix[site] is ""
           console.log "#{site} is unreachable"
-          done {"#{site} is unreachable"}, null
+          done {msg: "#{site} is unreachable", xhr: {status: 0}}, null
         else
-          url = "#{sitePrefix[site]}/#{route}?adapted"
+          url = "#{sitePrefix[site]}/#{route}"
           $.ajax
             type: 'GET'
             dataType: 'json'
@@ -221,9 +221,9 @@ siteAdapter.site = (site) ->
         findAdapter(site).prefix (prefix) ->
           if prefix is ""
             console.log "#{site} is unreachable"
-            done {"#{site} is unreachable"}, null
+            done {msg: "#{site} is unreachable", xhr: {status: 0}}, null
           else
-            url = "#{prefix}/#{route}?adapted"
+            url = "#{prefix}/#{route}"
             $.ajax
               type: 'GET'
               dataType: 'json'

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wiki-client",
-  "version": "0.8.3",
+  "version": "0.9.0-6",
   "description": "Federated Wiki - Client-side Javascript",
   "keywords": [
     "wiki",
@@ -31,13 +31,13 @@
     "test": "grunt mochaTest"
   },
   "devDependencies": {
-    "coffee-script": "^1.12.2",
+    "coffee-script": "^1.12.4",
     "coffeeify": "^2.1.0",
     "expect.js": "^0.3.1",
     "grunt": "^1.0.1",
     "grunt-browserify": "^5.0.0",
     "grunt-contrib-clean": "^1.0.0",
-    "grunt-contrib-uglify": "^2.0.0",
+    "grunt-contrib-uglify": "^2.2.0",
     "grunt-contrib-watch": "^1.0.0",
     "grunt-git-authors": "^3.2.0",
     "grunt-mocha-test": "^0.13.2",
@@ -55,6 +55,6 @@
     "url": "https://github.com/fedwiki/wiki-client/issues"
   },
   "engines": {
-    "node": ">=4.x"
+    "node": ">=6.x"
   }
 }
diff --git a/views/static.html b/views/static.html
@@ -39,8 +39,9 @@
       <div id='security' class='footer-item'></div>
 
       <span class='searchbox' class='footer-item'>
-        Search:
-        <input class='search' name='search' type='text'>
+        &nbsp;
+        <input class='search' name='search' type='text' placeholder="Search">
+        &nbsp;
         <span class='pages'></span>
       </span>