Skip to content

Commit

Permalink
* Move player code's URL space to /player/.
Browse files Browse the repository at this point in the history
  Added "ethercalc:md5(sheet-save)" as per discussion with @infojunkie.
  • Loading branch information
audreyt committed Jul 2, 2012
1 parent 01ffc37 commit edf198b
Show file tree
Hide file tree
Showing 8 changed files with 48 additions and 11 deletions.
6 changes: 3 additions & 3 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
<script src="/static/ethercalc.js"></script>
<script src="/socket.io/socket.io.js"></script>
<script src="/zappa/zappa.js"></script>
<script src="/player-broadcast.js"></script>
<script src="/player-graph.js"></script>
<script src="/player.js"></script>
<script src="/player/broadcast.js"></script>
<script src="/player/graph.js"></script>
<script src="/player/main.js"></script>

<link rel="stylesheet" type="text/css" href="/static/socialcalc.css">
<link rel="stylesheet" type="text/css" href="/static/index.css">
Expand Down
2 changes: 1 addition & 1 deletion player-broadcast.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
(function(){
this.include = function(){
return this.client({
'/player-broadcast.js': function(){
'/player/broadcast.js': function(){
var SocialCalc;
SocialCalc = window.SocialCalc || alert('Cannot find window.SocialCalc');
if (SocialCalc != null && SocialCalc.OrigDoPositionCalculations) {
Expand Down
2 changes: 1 addition & 1 deletion player-graph.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
(function(){
this.include = function(){
return this.client({
'/player-graph.js': function(){
'/player/graph.js': function(){
var $, SocialCalc, colorIndex, getBarColor, getDrawColor, UpdateGraphRangeProposal, GraphSetCells, DoGraph, GraphChanged, MinMaxChanged, GraphSave, GraphLoad, GraphVerticalBar, GraphHorizontalBar, MakePieChart, MakeLineChart, MakeScatterChart, scc, b1, b2, b3, b4, b5;
$ = window.jQuery || window.$ || alert('jQuery not available');
SocialCalc = window.SocialCalc || alert('Cannot find window.SocialCalc');
Expand Down
19 changes: 17 additions & 2 deletions player.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
(function(){
var __slice = [].slice;
this.include = function(){
return this.client({
'/player.js': function(){
'/player/main.js': function(){
var $, doPlay, onLoad, __ref, __this = this;
$ = window.jQuery || window.$ || alert('jQuery not available');
doPlay = function(){
Expand Down Expand Up @@ -104,7 +105,7 @@
find = new RegExp(peerClass, 'g');
cr = SocialCalc.coordToCr(ecell);
cell = SocialCalc.GetEditorCellElement(editor, cr.row, cr.col);
if (cell.element.className.search(find) === -1) {
if ((cell != null ? cell.element.className.search(find) : void 8) === -1) {
cell.element.className += peerClass;
}
}
Expand Down Expand Up @@ -224,6 +225,20 @@
window.spreadsheet = ss = ssInstance || (SocialCalc._view
? new SocialCalc.SpreadsheetViewer()
: new SocialCalc.SpreadsheetControl());
if (window.CryptoJS) {
if ((__ref = ss.editor) != null) {
__ref.SettingsCallbacks.ethercalc = {
save: function(){
return "ethercalc:" + CryptoJS.MD5(ss.sheet.CreateSheetSave()) + "\n";
},
load: function(){
var args;
args = __slice.call(arguments);
return alert(JSON.stringify(args));
}
};
}
}
if (!window.GraphOnClick) {
return;
}
Expand Down
2 changes: 1 addition & 1 deletion src/player-broadcast.ls
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@include = -> @client '/player-broadcast.js': ->
@include = -> @client '/player/broadcast.js': ->
SocialCalc = window.SocialCalc || alert 'Cannot find window.SocialCalc'

return if SocialCalc?OrigDoPositionCalculations
Expand Down
2 changes: 1 addition & 1 deletion src/player-graph.ls
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@include = -> @client '/player-graph.js': ->
@include = -> @client '/player/graph.js': ->
$ = window.jQuery || window.$ || alert('jQuery not available')
SocialCalc = window.SocialCalc || alert 'Cannot find window.SocialCalc'

Expand Down
10 changes: 8 additions & 2 deletions src/player.ls
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@include = -> @client '/player.js': ->
@include = -> @client '/player/main.js': ->
$ = window.jQuery || window.$ || alert('jQuery not available')
doPlay = ~>
window.SocialCalc ?= {}
Expand Down Expand Up @@ -62,7 +62,7 @@
find = new RegExp peerClass, \g
cr = SocialCalc.coordToCr ecell
cell = SocialCalc.GetEditorCellElement editor, cr.row, cr.col
if cell.element.className.search(find) == -1
if cell?element.className.search(find) == -1
cell.element.className += peerClass
| \ecell
peerClass = " #{@data.user} defaultPeer"
Expand Down Expand Up @@ -137,6 +137,12 @@
else
new SocialCalc.SpreadsheetControl!
)

if window.CryptoJS
ss.editor?SettingsCallbacks.ethercalc =
save: -> "ethercalc:#{CryptoJS.MD5 ss.sheet.CreateSheetSave!}\n"
load: (...args) -> alert JSON.stringify args

return unless window.GraphOnClick

ss.ExportCallback = (s) ->
Expand Down
16 changes: 16 additions & 0 deletions static/md5.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit edf198b

Please sign in to comment.