Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Slidable surface, and jsdiff with parent #7

Merged
merged 14 commits into from Mar 5, 2012
Merged

Slidable surface, and jsdiff with parent #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
5decd8f
Added a virtual surface that can be panned and zoomed by the user, ty…
emackey Jan 25, 2012
ccfb4a4
Remove incorrect keyword gl_Vertex (the correct keyword is gl_Positio…
emackey Jan 26, 2012
377ea4b
Fix some issues with the new virtual surface. Added a reset feature:…
emackey Jan 26, 2012
fbcef4b
Comment out a toolbar eventhandler that is causing a bug with CodeMir…
emackey Jan 26, 2012
d42ece6
Added a better solution to the toolbar/pan issue.
emackey Jan 28, 2012
cbeada5
Adjust tooltip on pan/zoom button.
emackey Mar 4, 2012
6cf3711
Added jsdifflib to show the difference between versions.
emackey Mar 4, 2012
858c291
Fix typo
emackey Mar 4, 2012
ff2a2e6
Remove unused code
emackey Mar 4, 2012
c2fa0c2
Fixed various issues with diff.
emackey Mar 4, 2012
1a67429
Styling and parent fixes for diff.
emackey Mar 4, 2012
b74d389
Update the diff color scheme to be similar to the rest of the site.
emackey Mar 5, 2012
13f3baa
Tweak the diff theme.
emackey Mar 5, 2012
ff2da0e
More diff bugfixes.
emackey Mar 5, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
83 changes: 83 additions & 0 deletions server/assets/css/diffview.css
View file
Open in desktop
@@ -0,0 +1,83 @@
/***
This is part of jsdifflib v1.0. <https://github.com/cemerick/jsdifflib>

Copyright (c) 2007, Snowtide Informatics Systems, Inc.
All rights reserved.

Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:

* Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
* Neither the name of the Snowtide Informatics Systems nor the names of its
contributors may be used to endorse or promote products derived from this
software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
DAMAGE.
***/
/* Author: Chas Emerick <cemerick@snowtide.com> */
table.diff {
border-collapse:collapse;
border:1px solid darkgray
}
table.diff tbody {
font-family:Courier, monospace
}
table.diff tbody th {
font-family:verdana,arial,'Bitstream Vera Sans',helvetica,sans-serif;
background:#EED;
font-size:11px;
font-weight:normal;
border:1px solid #BBC;
color:#886;
padding:.3em .5em .1em 2em;
text-align:right;
vertical-align:top
}
table.diff thead {
border-bottom:1px solid #BBC;
background:#EFEFEF;
font-family:Verdana
}
table.diff thead th.texttitle {
text-align:left
}
table.diff tbody td {
padding:0px .4em;
padding-top:.4em;
vertical-align:top;
}
table.diff .empty {
background-color:#DDD;
}
table.diff .replace {
background-color:#FD8
}
table.diff .delete {
background-color:#E99;
}
table.diff .skip {
background-color:#EFEFEF;
border:1px solid #AAA;
border-right:1px solid #BBC;
}
table.diff .insert {
background-color:#9E9
}
table.diff th.author {
text-align:right;
border-top:1px solid #BBC;
background:#EFEFEF
}
239 changes: 239 additions & 0 deletions server/assets/diff.html
View file
Open in desktop
@@ -0,0 +1,239 @@
<!doctype html>
<html>
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
<title>GLSL Sandbox Diff</title>
<link rel="stylesheet" type="text/css" href="css/diffview.css"/>
<script type="text/javascript" src="js/difflib.js"></script>
<script type="text/javascript" src="js/diffview.js"></script>
<script type="text/javascript" src='js/jquery.js'></script>
<style type="text/css">
body {
background-color: #000000;
font: 13px Tahoma, Arial, Helvetica, sans-serif;
margin: 0.5em 1em;
color: #888;
}
h1 {
display: block;
float: left;
font-weight: normal;
margin: 0.2em 0;
}
h2 {
margin: 0.5em 0 0.1em;
}
a, a:visited {
color: #aaa;
text-decoration: none;
border-bottom: 1px solid #444;
}
h1 a, h1 a:visited {
color: #009DE9;
}
a:focus, a:hover {
color: #009DE9;
border-bottom: 1px solid #009DE9;
}
label {
cursor: pointer;
font-size: 16px;
}
label:hover {
color: #009DE9;
text-decoration: underline;
}
#subtitle {
text-align: center;
clear: both;
}
.top {
text-align: center;
margin: 1em;
}
.powered {
display: block;
float: right;
margin: 1em;
}
.textInput {
display: block;
width: 49%;
float: left;
}
.spacer {
margin-left: 10px;
}
#diffoutput {
width: 100%;
margin-top: 1em;
}
/* give jsdiffview the dark theme */
table.diff {
white-space: pre-wrap;
border:1px solid #334;
}
table.diff tbody th {
background: #223;
border:1px solid #334;
}
table.diff thead {
background: #111;
border-bottom:1px solid #334;
}
table.diff .empty {
background-color:#222;
}
table.diff .replace {
background-color:#431;
color: #FD8;
}
table.diff .delete {
background-color:#411;
color: #f88;
}
table.diff .skip {
background-color:#111;
border:1px solid #555;
border-right:1px solid #334;
}
table.diff .insert {
background-color:#141;
color: #0f0;
}
table.diff th.author {
border-top:1px solid #334;
background:#111;
}
</style>

<script type="text/javascript">
var leftSide = { id: '', code: '', name: '', parent: null, loaded: false },
rightSide = { id: '', code: '', name: '', parent: null, loaded: false },
viewTypes = { sideBySide: 0, viewInline: 1 };

function showDiff(viewType) {
var leftText = difflib.stringAsLines(leftSide.code);
var rightText = difflib.stringAsLines(rightSide.code);
var sm = new difflib.SequenceMatcher(leftText, rightText);
var opcodes = sm.get_opcodes();
var diffoutputdiv = document.getElementById("diffoutput");
diffoutputdiv.innerHTML = "";
diffoutputdiv.appendChild(diffview.buildView({
baseTextLines: leftText,
newTextLines: rightText,
opcodes: opcodes,
baseTextName: leftSide.name,
newTextName: rightSide.name,
contextSize: null,
viewType: viewType
}));
}

function computeNames() {
if (!leftSide.loaded) {
leftSide.name = 'Not loaded';
} else if (rightSide.parent === leftSide.id) {
leftSide.name = 'parent effect ' + leftSide.id;
} else {
leftSide.name = 'effect ' + leftSide.id;
}

if (!rightSide.loaded) {
rightSide.name = 'Not loaded';
} else if (leftSide.parent === rightSide.id) {
rightSide.name = 'parent effect ' + rightSide.id;
} else {
rightSide.name = 'effect ' + rightSide.id;
}

document.getElementById('subtitle').innerHTML = 'diff ' +
'<a href="e#' + leftSide.id + '">' + leftSide.name + '</a> vs. ' +
'<a href="e#' + rightSide.id + '">' + rightSide.name + '</a>';
}

function load_code(side) {
$.getJSON('item/'+side.id, function(result) {
side.code = result.code;
if (result.parent) {
side.parent = result.parent.substring(3);
} else {
side.parent = null;
}
side.loaded = true;
if (leftSide.loaded && rightSide.loaded) {
computeNames();
showDiff(viewTypes.sideBySide);
}
}).error(function (jqXHR, textStatus, errorThrown) {
alert(textStatus);
});
}

function onHashChange() {
// hash format: #a-vs-b
var hash = window.location.hash,
pos = hash.indexOf('-vs-'),
newLeftID = null,
newRightID = null;

document.getElementById('subtitle').innerHTML = 'diff';

if ((pos < 2) || ((hash.length - pos) < 5)) {
leftSide.loaded = rightSide.loaded = false;
leftSide.name = rightSide.name = 'invalid';
leftSide.code = rightSide.code = 'invalid';
leftSide.parent = rightSide.parent = null;
document.getElementById("diffoutput").innerHTML = "Invalid Diff URL.";
} else {
newLeftID = hash.substring(1, pos);
newRightID = hash.substring(pos + 4);
if (newLeftID !== leftSide.id) {
leftSide.id = newLeftID;
leftSide.name = 'Loading...';
leftSide.code = '';
leftSide.parent = null;
leftSide.loaded = false;
}
if (newRightID !== rightSide.id) {
rightSide.id = newRightID;
rightSide.name = 'Loading...';
rightSide.code = '';
rightSide.parent = null;
rightSide.loaded = false;
}
if (!(leftSide.loaded && rightSide.loaded)) {
document.getElementById("diffoutput").innerHTML = "Loading...";
if (!leftSide.loaded) {
load_code(leftSide);
}
if (!rightSide.loaded) {
load_code(rightSide);
}
}
}
}

// on DOM ready
$(function () {
window.onhashchange = function () { onHashChange(); };
onHashChange();
});

</script>
</head>
<body>
<h1><a href="/">GLSL Sandbox</a></h1>
<div class="powered">Powered by <a href="https://github.com/cemerick/jsdifflib">jsdifflib</a></div>
<h2 id="subtitle">diff</h2>
<div class="top">
<input type="radio" name="_viewtype" checked="checked" id="sidebyside" onclick="showDiff(0);" />
<label for="sidebyside">Side-by-side diff</label>
&nbsp; &nbsp;
<input type="radio" name="_viewtype" id="inline" onclick="showDiff(1);" />
<label for="inline">Inline diff</label>
</div>
<div id="diffoutput">Loading...</div>
</body>
</html>