blank.html
js/json2005.js
js/rsh.js
@@ -9,7 +9,6 @@ rm $OUTFILE
$RHINOC js/jquery.js >> $OUTFILE 2>&1
$RHINOC js/jquery.dimensions.js >> $OUTFILE 2>&1
-$RHINOC js/jquery.history.js >> $OUTFILE 2>&1
$RHINOC js/lang.js >> $OUTFILE 2>&1
$RHINOC js/eidogo.js >> $OUTFILE 2>&1
$RHINOC js/util.js >> $OUTFILE 2>&1
build.sh
@@ -1,16 +1,24 @@
planned for 1.0
+- sgf coord permalinks, named node permalinks (use MPTT)
+ - allow sgf coord equivalent to Player.variation()?
- unsaved changes notice for permalink, save
-- show resignation comment
-- showTools/showComments/showButtons(?) preference (disallow implicit selection too)
+- showComments?
- create compact embeddedable version
- test multiple instances on a page
- time left issue
+- merge iphone and player css
+- finish i18n
+- hyperlink title
- remove core language modifications?
-- brief help text (keyboard shortcuts, etc)
+- brief help text (keyboard shortcuts, etc)?
+- improve search dim handling when editing
+- fix safari 2 history?
+- announce on senseis, godiscussions
planned for after 1.0
- continuations for pattern search
- "more" search results link
+- score tool
- game archive browsing/searching
- decouple player and board renderer (click events)
- canvas renderer: dojo.gfx or similar? (non-regular-sized boards)
doc/todo.txt
@@ -25,7 +25,6 @@
-->
<script type="text/javascript" src="js/jquery.js"></script>
<script type="text/javascript" src="js/jquery.dimensions.js"></script>
-<script type="text/javascript" src="js/jquery.history.js"></script>
<script type="text/javascript" src="js/lang.js"></script>
<script type="text/javascript" src="js/eidogo.js"></script>
<script type="text/javascript" src="js/util.js"></script>
@@ -49,16 +48,16 @@
Maintained by <a href="http://tin.nu/">Justin Kramer</a>.</p>
<ul id="links">
- <li><a href="./#kjd">Joseki Tutor</a></li>
- <li><a href="./#search">Pattern Search</a></li>
+ <li><a href="/#kjd">Joseki Tutor</a></li>
+ <li><a href="/#search">Pattern Search</a></li>
<li><a href="tourney">Tourney Games</a></li>
<li><a href="upload">Upload</a></li>
- <li><a href="./#gnugo" style='padding-right: 4px'>GNU Go</a></li>
- <li><a href="./#gnugo-9" style='padding-left: 4px; padding-right: 4px'>9x9</a></li>
- <li><a href="./#gnugo-13" style='padding-left: 4px'>13x13</a></li>
- <li><a href="./#blank" style='padding-right: 4px'>Blank Board</a></li>
- <li><a href="./#blank-9" style='padding-left: 4px; padding-right: 4px'>9x9</a></li>
- <li><a href="./#blank-13" style='padding-left: 4px'>13x13</a></li>
+ <li><a href="/#gnugo" style='padding-right: 4px'>GNU Go</a></li>
+ <li><a href="/#gnugo-9" style='padding-left: 4px; padding-right: 4px'>9x9</a></li>
+ <li><a href="/#gnugo-13" style='padding-left: 4px'>13x13</a></li>
+ <li><a href="/#blank" style='padding-right: 4px'>Blank Board</a></li>
+ <li><a href="/#blank-9" style='padding-left: 4px; padding-right: 4px'>9x9</a></li>
+ <li><a href="/#blank-13" style='padding-left: 4px'>13x13</a></li>
<li><a href="http://senseis.xmp.net/?EidoGo">Info</a></li>
</ul>
header.phtml
@@ -7,13 +7,6 @@ var player;
var hooks = {
initGame: function() {
var gameRoot = this.gameTree.trees.first().nodes.first();
- if (this.gameName == "kjd" || this.gameName == "gnugo" || this.gameName == "search") {
- eidogo.util.hide(this.dom.optionSave);
- eidogo.util.hide(this.dom.optionDownload);
- } else {
- eidogo.util.show(this.dom.optionSave);
- eidogo.util.show(this.dom.optionDownload);
- }
var gn = gameRoot.GN || this.gameName;
if (gn) {
// set the page title
@@ -29,14 +22,14 @@ var player;
setPermalink: function() {
var hash = (this.gameName ? this.gameName : "") + ":" +
this.cursor.getPath().join(",");
- jQuery.historyLoad(hash);
+ addHistory(hash);
},
searchRegion: function(params) {
this.hooks.initGame.call(this); // update title
var hash = "search:" + params.q + ":" + params.w + "x" + params.h +
":" + this.compressPattern(params.p) + ":" + params.a;
if (hash != location.hash.replace(/^#/, "")) {
- jQuery.historyLoad(hash);
+ addHistory(hash);
}
},
saved: function(gn) {
@@ -57,7 +50,9 @@ var player;
markVariations: true,
markNext: false,
showGameInfo: true,
- showPlayerInfo: true
+ showPlayerInfo: true,
+ showSave: true,
+ showTools: true
};
for (var key in params) {
cfg[key] = params[key];
@@ -76,7 +71,10 @@ var player;
player.loadSgf(cfg, completeFn);
}
+ var notLoaded = true;
+
function loadState(hash) {
+ notLoaded = false;
var hashParts = hash ? hash.replace(/^#/, "").split(/:/) : [];
var gameName = hashParts[0] || "";
var loadPath = hashParts[1] ? hashParts[1].split(",") : null;
@@ -88,7 +86,8 @@ var player;
loadPath: loadPath,
progressiveLoad: true,
markNext: true,
- showPlayerInfo: false
+ showPlayerInfo: false,
+ showSave: false
});
return;
}
@@ -101,11 +100,12 @@ var player;
}
if (gameName == "search") {
if (loadPath) {
- loadGame();
+ loadGame({showSave: false});
player.loadSearch.apply(player, rest);
} else {
loadGame({
gameName: "search",
+ showSave: false,
loadPath: [0,0]
});
}
@@ -130,14 +130,39 @@ var player;
});
}
+ function addHistory(hash) {
+ if (dhtmlHistory.isSafari) {
+ // this doesn't really work, but oh well
+ location.hash = hash;
+ } else {
+ dhtmlHistory.add(hash);
+ }
+ }
+
+ window.dhtmlHistory.create({
+ toJSON: function(o) {
+ return JSON.stringify(o);
+ },
+ fromJSON: function(s) {
+ return JSON.parse(s);
+ }
+ });
+
eidogo.util.addEvent(window, "load", function() {
eidogo.util.addEvent(document, "click", function(evt) {
var target = eidogo.util.getTarget(evt)
- if (target.nodeName.toUpperCase() != "A" || target.href.indexOf("#") == -1) return;
- jQuery.historyLoad(target.href.replace(/^.*#/, ""));
+ if (target.nodeName.toUpperCase() != "A" || target.href.indexOf("#") == -1) return true;
+ var hash = target.href.replace(/^.*#/, "");
+ addHistory(hash);
+ loadState(hash);
eidogo.util.stopEvent(evt);
});
- jQuery.historyInit(loadState);
+ dhtmlHistory.initialize();
+ dhtmlHistory.addListener(loadState);
+ if (notLoaded) {
+ // make sure we load our state on first page load (RSH quirk)
+ loadState(location.hash.replace(/^#/, ""));
+ }
});
})();
\ No newline at end of file
index.js
@@ -1,5 +1,7 @@
<?php include("header.phtml"); ?>
+<script type="text/javascript" src="js/json2005.js"></script>
+<script type="text/javascript" src="js/rsh.js"></script>
<script type="text/javascript" src="index.js"></script>
<div id="player-container"></div>
index.phtml
@@ -189,8 +189,8 @@ eidogo.BoardRendererHtml.prototype = {
domContainer.appendChild(domBoard);
this.domNode = domBoard;
this.renderCache = {
- stones: [].setLength(this.boardSize, 0).addDimension(this.boardSize, 0),
- markers: [].setLength(this.boardSize, 0).addDimension(this.boardSize, 0)
+ stones: [].setLength(this.boardSize, 0).addDimension(this.boardSize, 0),
+ markers: [].setLength(this.boardSize, 0).addDimension(this.boardSize, 0)
}
// auto-detect point width, point height, and margin
this.pointWidth = 0;
@@ -241,6 +241,7 @@ eidogo.BoardRendererHtml.prototype = {
case "ex":
case "territory-white":
case "territory-black":
+ case "dim":
case "current":
break;
default:
js/board.js
@@ -14,6 +14,7 @@ if (typeof eidogo.i18n == "undefined") {
'move': 'Move',
'loading': 'Loading',
'passed': 'passed',
+ 'resigned': 'resigned',
'variations': 'Variations',
'no variations': 'none',
@@ -29,15 +30,13 @@ if (typeof eidogo.i18n == "undefined") {
'x': 'X',
'letter': 'Letter',
'number': 'Number',
+ 'dim': 'Dim',
'search': 'Search',
'search corner': 'Corner Search',
'search center': 'Center Search',
- 'region info': 'Click and drag to select a region. If your browser\
- does not support dragging (e.g., iPhone), click once to begin the selection\
- and click once to end it.',
+ 'region info': 'Click and drag to select a region.',
'two stones': 'Please select at least two stones to search for.',
- 'two edges': 'For corner searches, your selection must \
- touch two adjacent edges of the board.',
+ 'two edges': 'For corner searches, your selection must touch two adjacent edges of the board.',
'no search url': 'No search URL provided.',
'white': 'White',
js/i18n.js
@@ -132,6 +132,7 @@
SQ: this.addMarker, // square
TW: this.addMarker,
TB: this.addMarker,
+ DD: this.addMarker,
PL: this.setColor,
C: this.showComments,
N: this.showAnnotation,
@@ -234,6 +235,8 @@
this.prefs.markVariations = !!cfg.markVariations;
this.prefs.showGameInfo = !!cfg.showGameInfo;
this.prefs.showPlayerInfo = !!cfg.showPlayerInfo;
+ this.prefs.showTools = !!cfg.showTools;
+ this.prefs.showSave = !!cfg.showSave;
},
/**
@@ -309,6 +312,7 @@
* dynamically-loaded games).
**/
initGame: function(target) {
+ this.handleDisplayPrefs();
var gameRoot = target.trees.first().nodes.first();
var size = gameRoot.SZ;
if (!this.board) {
@@ -321,15 +325,21 @@
while (moveCursor.next()) { this.totalMoves++; }
this.totalMoves--;
this.showInfo();
- if (this.prefs.showPlayerInfo) {
- show(this.dom.infoPlayers);
- } else {
- hide(this.dom.infoPlayers);
- }
- this.enableNavSlider();
+ this.enableNavSlider();
this.selectTool("play");
this.hook("initGame");
},
+
+ /**
+ * Shows or hides interface elements as configured
+ **/
+ handleDisplayPrefs: function() {
+ (this.prefs.showGameInfo || this.prefs.showPlayerInfo ? show : hide)(this.dom.info);
+ (this.prefs.showGameInfo ? show : hide)(this.dom.infoGame);
+ (this.prefs.showPlayerInfo ? show : hide)(this.dom.infoPlayers);
+ (this.prefs.showSave ? show : hide)(this.dom.options);
+ (this.prefs.showTools ? show : hide)(this.dom.toolsContainer);
+ },
/**
* Create our board, tie it to a Rules instance, and add appropriate event
@@ -337,6 +347,7 @@
**/
createBoard: function(size) {
size = size || 19;
+ if (this.board && this.board.renderer && this.board.boardSize == size) return;
try {
this.dom.boardContainer.innerHTML = "";
var renderer = new eidogo.BoardRendererHtml(this.dom.boardContainer, size);
@@ -498,17 +509,17 @@
}
} else if (path.length) {
// tree position
- this.variation(position, true);
- if (path.length != 1) {
+ this.variation(position, true);
+ if (path.length != 1) {
// go to the end of the line for each tree we pass
while (this.cursor.nextNode()) {
- this.execNode(true);
+ this.execNode(true, true);
}
}
- if (path.length > 1 && this.progressiveLoads) return;
- }
+ if (this.progressiveLoads) return;
+ }
}
- this.refresh();
+ this.refresh();
} else if (!isNaN(parseInt(path, 10))) {
// Go to a move number.
var steps = parseInt(path, 10);
@@ -550,7 +561,6 @@
setTimeout(function() { me.refresh.call(me); }, 10);
return;
}
-
this.moveNumber--;
if (this.moveNumber < 0) this.moveNumber = 0;
this.board.revert(1);
@@ -580,10 +590,13 @@
* functions. Also resets some settings and makes sure the interface
* gets updated.
* @param {Boolean} noRender If true, don't render the board
+ * @param {Boolean} ignoreProgressive Ignores progressive loading
+ * considerations. Useful when executing to the end of a sibling
+ * line when a variation load is still in progress.
*/
- execNode: function(noRender) {
+ execNode: function(noRender, ignoreProgressive) {
// don't execute a node while it's being loaded
- if (this.progressiveLoads) {
+ if (!ignoreProgressive && this.progressiveLoads) {
var me = this;
setTimeout(function() { me.execNode.call(me, noRender); }, 10);
return;
@@ -626,7 +639,7 @@
}
// progressive loading?
- if (this.progressiveUrl && !this.cursor.node.parent.cached) {
+ if (!ignoreProgressive && this.progressiveUrl && !this.cursor.node.parent.cached) {
this.nowLoading();
this.progressiveLoads++;
this.remoteLoad(
@@ -830,6 +843,7 @@
case "sq": prop = "SQ"; break;
case "cr": prop = "CR"; break;
case "x": prop = "MA"; break;
+ case "dim": prop = "DD"; break;
case "number":
prop = "LB";
coord = coord + ":" + this.labelLastNumber;
@@ -848,7 +862,7 @@
},
handleDocMouseUp: function(evt) {
- if (this.domLoading) return;
+ if (this.domLoading) return true;
if (this.mode == "region" && this.regionBegun && !this.regionClickSelect) {
// end of region selection
this.mouseDown = false;
@@ -856,6 +870,7 @@
show(this.dom.searchAlgo, "inline");
show(this.dom.searchButton, "inline");
}
+ return true;
},
boundsCheck: function(x, y, region) {
@@ -930,14 +945,23 @@
this.cursor.node.pushProperty(c, this.pointToSgfCoord({x:l+x, y:t+y}));
}
}
- this.refresh();
+
this.regionLeft = l;
this.regionTop = t;
this.regionRight = l + x;
this.regionBottom = t + y;
+ var b = this.getRegionBounds();
+ var r = [b[1], b[0], b[1]+b[2], b[0]+b[3]];
+ for (y = 0; y < this.board.boardSize; y++) {
+ for (x = 0; x < this.board.boardSize; x++) {
+ if (!this.boundsCheck(x, y, r)) {
+ this.cursor.node.pushProperty('DD', this.pointToSgfCoord({x:x, y:y}));
+ }
+ }
+ }
this.dom.searchAlgo.value = a;
-
+ this.refresh();
this.searchRegion();
},
@@ -995,7 +1019,6 @@
quadrant += (edges.contains('w') ? "w" : "e");
this.showComments("");
- this.nowLoading();
this.gameName = "search";
var success = function(req) {
@@ -1048,8 +1071,9 @@
this.prefs.markNext = false;
this.prefs.showPlayerInfo = true;
- this.hook("searchRegion", params);
+ this.hook("searchRegion", params);
+ this.nowLoading();
ajax('get', this.searchUrl, params, success, failure, this, 45000);
},
@@ -1272,9 +1296,7 @@
dl.appendChild(dd);
}
}
- if (this.prefs.showGameInfo) {
- this.dom.infoGame.appendChild(dl);
- }
+ this.dom.infoGame.appendChild(dl);
},
selectTool: function(tool) {
@@ -1381,15 +1403,18 @@
if (!this.cursor.node['MN']) {
this.moveNumber++;
}
- if (coord && coord != "tt") {
+ if ((!coord || coord == "tt" || coord == "") && !noRender) {
+ this.prependComment((color == this.board.WHITE ?
+ t['white'] : t['black']) + " " + t['passed'], "comment-pass");
+ } else if (coord == "resign") {
+ this.prependComment((color == this.board.WHITE ?
+ t['white'] : t['black']) + " " + t['resigned'], "comment-resign");
+ } else {
this.board.addStone(pt, color);
this.rules.apply(pt, color);
if (this.prefs.markCurrent && !noRender) {
this.addMarker(coord, "current");
}
- } else if (!noRender) {
- this.prependComment((color == this.board.WHITE ?
- t['white'] : t['black']) + " " + t['passed'], "comment-pass");
}
},
@@ -1421,6 +1446,7 @@
case "MA": label = "ex"; break;
case "TW": label = "territory-white"; break;
case "TB": label = "territory-black"; break;
+ case "DD": label = "dim"; break;
case "LB": label = (coord[i].split(":"))[1]; coord[i]; break;
default: label = type; break;
}
@@ -1525,13 +1551,14 @@
<option value='play'>" + t['play'] + "</option>\
<option value='add_b'>" + t['add_b'] + "</option>\
<option value='add_w'>" + t['add_w'] + "</option>\
- " + (this.searchUrl ? ("<option value='region'>" + t['region'] + "</option>") : "") +"\
+ " + (this.searchUrl && this.showTools ? ("<option value='region'>" + t['region'] + "</option>") : "") +"\
<option value='tr'>" + t['triangle'] + "</option>\
<option value='sq'>" + t['square'] + "</option>\
<option value='cr'>" + t['circle'] + "</option>\
<option value='x'>" + t['x'] + "</option>\
<option value='letter'>" + t['letter'] + "</option>\
<option value='number'>" + t['number'] + "</option>\
+ <option value='dim'>" + t['dim'] + "</option>\
</select>\
<select id='search-algo' class='search-algo'>\
<option value='corner'>" + t['search corner'] + "</option>\
@@ -1628,9 +1655,9 @@
}.bind(this));
addEvent(this.dom.toolsSelect, 'change', function(e) {
- this.selectTool.apply(this, [(e.target || e.srcElement).value]);
- }, this, true);
- },
+ this.selectTool.apply(this, [(e.target || e.srcElement).value]);
+ }, this, true);
+ },
enableNavSlider: function() {
// don't use slider for progressively-loaded games
@@ -1660,10 +1687,11 @@
}, this, true);
addEvent(document, "mouseup", function(e) {
- if (!sliding) return;
+ if (!sliding) return true;
sliding = false;
var xy = getElClickXY(e, this.dom.navSlider);
this.updateNavSlider(xy[0]);
+ return true;
}, this, true);
},
js/player.js
@@ -6,3 +6,7 @@
background: none;
filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="player/images/w.png");
}
+.eidogo-player .board .point.marker.dim {
+ background: none;
+ filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="player/images/dim.png");
+}
player/player-ie6.css
@@ -206,7 +206,7 @@
margin: 0 0 0 10px;
display: none;
}
-.eidogo-player .comment-pass {
+.eidogo-player .comment-pass, .eidogo-player .comment-resign {
color: #800;
font-weight: bold;
margin: 0 0 10px 0;
player/player-iphone.css
@@ -189,7 +189,7 @@
margin: 0 0 0 8px;
display: none;
}
-.eidogo-player .comment-pass {
+.eidogo-player .comment-pass, .eidogo-player .comment-resign {
color: #800;
font-weight: bold;
margin: 0 0 10px 0;
@@ -391,6 +391,9 @@
.eidogo-player .board .point.marker.territory-black {
background: url(images/territory-black.gif);
}
+.eidogo-player .board .point.marker.dim {
+ background: url(images/dim.png);
+}
.eidogo-player .board-hover-move {
position: absolute;
width: 19px;
@@ -408,6 +411,7 @@
background-image: url(images/w.gif);
}
.eidogo-player .info {
+ display: none;
float: left;
width: 421px;
margin: 5px 0 0 0;
@@ -492,6 +496,9 @@
color: #888;
display: none;
}
+.eidogo-player .options {
+ display: none;
+}
.eidogo-player .options a {
float: left;
display: block;
@@ -501,7 +508,6 @@
background: #181818;
border: 1px solid #282828;
text-align: center;
- display: none;
}
.eidogo-loading {
position: absolute;
player/player.css
@@ -130,7 +130,7 @@ pre, code {
display: block;
padding: 5px;
}
-#tourney-games tr.odd:hover a, #tourney-games tr.even:hover a {
+#tourney-games tr.odd:hover, #tourney-games tr.even:hover {
background: #bbe;
text-decoration: underline;
}
\ No newline at end of file
site-style.css
5ceba7963bfc5c71d8277612ba50e3945dc63e2d
jkkramer
jkkramer@3a017fa3-8d26-0410-b3dd-4f2ae428da9e
http://github.com/jkk/eidogo/commit/f985a9eb2fc8737aab8b780e4b0935b60d6a700a
f985a9eb2fc8737aab8b780e4b0935b60d6a700a
2007-11-11T15:20:26-08:00
2007-11-11T15:20:26-08:00
replaced jQuery.history with RSH, fixed long-standing KGS permalink bug(!!!), extra show/hide preferences, etc
git-svn-id: https://eidogo.googlecode.com/svn/trunk@56 3a017fa3-8d26-0410-b3dd-4f2ae428da9e
c2a89a7a89c16166cd7a9de01e60cac1e3bb85b5
jkkramer
jkkramer@3a017fa3-8d26-0410-b3dd-4f2ae428da9e