manual merge changes

WardCunningham · Mar 12, 2013 · eb2ed5f · eb2ed5f
2 parents ae0b555 + 19802d4
commit eb2ed5f
Show file tree

Hide file tree

Showing 11 changed files with 39 additions and 39 deletions.
diff --git a/client/client.coffee b/client/client.coffee
@@ -1,3 +1,3 @@
-window.wiki = require('./lib/wiki')
+window.wiki = require('./lib/wiki.coffee')
 require('./lib/legacy.coffee')
 
diff --git a/client/client.js b/client/client.js
@@ -395,7 +395,7 @@ require.define("/lib/wiki.coffee",function(require,module,exports,__dirname,__fi
   var createSynopsis, wiki,
     __slice = [].slice;
 
-  createSynopsis = require('./synopsis');
+  createSynopsis = require('./synopsis.coffee');
 
   wiki = {
     createSynopsis: createSynopsis
@@ -1024,13 +1024,13 @@ require.define("/lib/util.coffee",function(require,module,exports,__dirname,__fi
 require.define("/lib/pageHandler.coffee",function(require,module,exports,__dirname,__filename,process,global){(function() {
   var addToJournal, pageFromLocalStorage, pageHandler, pushToLocal, pushToServer, recursiveGet, revision, state, util;
 
-  util = require('./util');
+  util = require('./util.coffee');
 
-  state = require('./state');
+  state = require('./state.coffee');
 
-  revision = require('./revision');
+  revision = require('./revision.coffee');
 
-  addToJournal = require('./addToJournal');
+  addToJournal = require('./addToJournal.coffee');
 
   module.exports = pageHandler = {};
 
@@ -1249,7 +1249,7 @@ require.define("/lib/state.coffee",function(require,module,exports,__dirname,__f
   var active, state,
     __indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; };
 
-  active = require('./active');
+  active = require('./active.coffee');
 
   module.exports = state = {};
 
@@ -1490,7 +1490,7 @@ require.define("/lib/revision.coffee",function(require,module,exports,__dirname,
 require.define("/lib/addToJournal.coffee",function(require,module,exports,__dirname,__filename,process,global){(function() {
   var util;
 
-  util = require('./util');
+  util = require('./util.coffee');
 
   module.exports = function(journalElement, action) {
     var actionElement, actionTitle, controls, pageElement, prev;
@@ -1673,9 +1673,9 @@ require.define("/lib/refresh.coffee",function(require,module,exports,__dirname,_
 
   neighborhood = require('./neighborhood.coffee');
 
-  addToJournal = require('./addToJournal');
+  addToJournal = require('./addToJournal.coffee');
 
-  wiki = require('./wiki');
+  wiki = require('./wiki.coffee');
 
   handleDragging = function(evt, ui) {
     var action, before, beforeElement, destinationPageElement, equals, item, itemElement, moveFromPage, moveToPage, moveWithinPage, order, sourcePageElement, sourceSite, thisPageElement;
@@ -2172,9 +2172,9 @@ require.define("/lib/neighborhood.coffee",function(require,module,exports,__dirn
 require.define("/lib/search.coffee",function(require,module,exports,__dirname,__filename,process,global){(function() {
   var active, createSearch, util;
 
-  util = require('./util');
+  util = require('./util.coffee');
 
-  active = require('./active');
+  active = require('./active.coffee');
 
   createSearch = function(_arg) {
     var neighborhood, performSearch;
@@ -2227,7 +2227,7 @@ require.define("/lib/search.coffee",function(require,module,exports,__dirname,__
 
 require.define("/client.coffee",function(require,module,exports,__dirname,__filename,process,global){(function() {
 
-  window.wiki = require('./lib/wiki');
+  window.wiki = require('./lib/wiki.coffee');
 
   require('./lib/legacy.coffee');
 

diff --git a/client/lib/addToJournal.coffee b/client/lib/addToJournal.coffee
@@ -1,4 +1,4 @@
-util = require './util'
+util = require './util.coffee'
 
 module.exports = (journalElement, action) ->
   pageElement = journalElement.parents('.page:first')

diff --git a/client/lib/pageHandler.coffee b/client/lib/pageHandler.coffee
@@ -1,7 +1,7 @@
-util = require('./util')
-state = require('./state')
-revision = require('./revision')
-addToJournal = require('./addToJournal')
+util = require('./util.coffee')
+state = require('./state.coffee')
+revision = require('./revision.coffee')
+addToJournal = require('./addToJournal.coffee')
 
 module.exports = pageHandler = {}
 

diff --git a/client/lib/refresh.coffee b/client/lib/refresh.coffee
@@ -3,8 +3,8 @@ pageHandler = require('./pageHandler.coffee')
 plugin = require('./plugin.coffee')
 state = require('./state.coffee')
 neighborhood = require('./neighborhood.coffee')
-addToJournal = require('./addToJournal')
-wiki = require('./wiki')
+addToJournal = require('./addToJournal.coffee')
+wiki = require('./wiki.coffee')
 
 handleDragging = (evt, ui) ->
   itemElement = ui.item

diff --git a/client/lib/search.coffee b/client/lib/search.coffee
@@ -1,5 +1,5 @@
-util = require('./util')
-active = require('./active')
+util = require('./util.coffee')
+active = require('./active.coffee')
 
 createSearch = ({neighborhood})->
   performSearch = (searchQuery)->

diff --git a/client/lib/state.coffee b/client/lib/state.coffee
@@ -1,4 +1,4 @@
-active = require('./active')
+active = require('./active.coffee')
 
 module.exports = state = {}
 

diff --git a/client/lib/wiki.coffee b/client/lib/wiki.coffee
@@ -1,4 +1,4 @@
-createSynopsis = require './synopsis'
+createSynopsis = require './synopsis.coffee'
 
 wiki = { createSynopsis }
 

diff --git a/client/package.json b/client/package.json
@@ -8,8 +8,8 @@
     "browserify": "1.17.3"
   },
   "scripts": {
-    "test": "./node_modules/.bin/browserify testclient.coffee ./plugins/*/test.coffee -o test/testclient.js",
-    "start": "./node_modules/.bin/browserify client.coffee -o client.js"
+    "test": "./node_modules/.bin/browserify -c 'coffee -sc' testclient.coffee ./plugins/*/test.coffee > test/testclient.js",
+    "start": "./node_modules/.bin/browserify -c 'coffee -sc' client.coffee > client.js"
   },
   "devDependencies": {
     "mocha": "*",

diff --git a/client/test/testclient.js b/client/test/testclient.js
@@ -395,7 +395,7 @@ require.define("/lib/wiki.coffee",function(require,module,exports,__dirname,__fi
   var createSynopsis, wiki,
     __slice = [].slice;
 
-  createSynopsis = require('./synopsis');
+  createSynopsis = require('./synopsis.coffee');
 
   wiki = {
     createSynopsis: createSynopsis
@@ -931,13 +931,13 @@ require.define("/test/pageHandler.coffee",function(require,module,exports,__dirn
 require.define("/lib/pageHandler.coffee",function(require,module,exports,__dirname,__filename,process,global){(function() {
   var addToJournal, pageFromLocalStorage, pageHandler, pushToLocal, pushToServer, recursiveGet, revision, state, util;
 
-  util = require('./util');
+  util = require('./util.coffee');
 
-  state = require('./state');
+  state = require('./state.coffee');
 
-  revision = require('./revision');
+  revision = require('./revision.coffee');
 
-  addToJournal = require('./addToJournal');
+  addToJournal = require('./addToJournal.coffee');
 
   module.exports = pageHandler = {};
 
@@ -1156,7 +1156,7 @@ require.define("/lib/state.coffee",function(require,module,exports,__dirname,__f
   var active, state,
     __indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; };
 
-  active = require('./active');
+  active = require('./active.coffee');
 
   module.exports = state = {};
 
@@ -1340,7 +1340,7 @@ require.define("/lib/revision.coffee",function(require,module,exports,__dirname,
 require.define("/lib/addToJournal.coffee",function(require,module,exports,__dirname,__filename,process,global){(function() {
   var util;
 
-  util = require('./util');
+  util = require('./util.coffee');
 
   module.exports = function(journalElement, action) {
     var actionElement, actionTitle, controls, pageElement, prev;
@@ -1449,9 +1449,9 @@ require.define("/lib/refresh.coffee",function(require,module,exports,__dirname,_
 
   neighborhood = require('./neighborhood.coffee');
 
-  addToJournal = require('./addToJournal');
+  addToJournal = require('./addToJournal.coffee');
 
-  wiki = require('./wiki');
+  wiki = require('./wiki.coffee');
 
   handleDragging = function(evt, ui) {
     var action, before, beforeElement, destinationPageElement, equals, item, itemElement, moveFromPage, moveToPage, moveWithinPage, order, sourcePageElement, sourceSite, thisPageElement;
@@ -2089,9 +2089,9 @@ require.define("/lib/neighborhood.coffee",function(require,module,exports,__dirn
 require.define("/lib/search.coffee",function(require,module,exports,__dirname,__filename,process,global){(function() {
   var active, createSearch, util;
 
-  util = require('./util');
+  util = require('./util.coffee');
 
-  active = require('./active');
+  active = require('./active.coffee');
 
   createSearch = function(_arg) {
     var neighborhood, performSearch;
@@ -3435,7 +3435,7 @@ require.define("/testclient.coffee",function(require,module,exports,__dirname,__
 
   mocha.setup('bdd');
 
-  window.wiki = require('./lib/wiki');
+  window.wiki = require('./lib/wiki.coffee');
 
   require('./test/util.coffee');
 

diff --git a/client/testclient.coffee b/client/testclient.coffee
@@ -1,6 +1,6 @@
 mocha.setup('bdd')
 
-window.wiki = require('./lib/wiki')
+window.wiki = require('./lib/wiki.coffee')
 
 require('./test/util.coffee')
 require('./test/active.coffee')