Skip to content

Commit

Permalink
fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
apb2006 committed Mar 8, 2015
1 parent 00c0ce3 commit 0b19756
Show file tree
Hide file tree
Showing 10 changed files with 23 additions and 10 deletions.
7 changes: 5 additions & 2 deletions src/graphxq/graphxq.xqm
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,9 @@ function graphxq-svg($dot,$url,$dl,$dotopt) {
declare
%restxq:GET %restxq:path("graphxq/dot")
%output:method("html") %output:version("5.0")
%restxq:form-param("src","{$src}")
%restxq:query-param("src","{$src}")
function dotform($src){
let $_:=fn:trace($src,"SRC")
let $dot:= getdot("digraph {a -> b}",$src)
let $svgwidget:=fn:doc("views/widget.svg")
let $toolbar:=fn:doc("views/toolbar.xml")
Expand All @@ -80,12 +81,14 @@ function dotform($src){
declare
%restxq:GET %restxq:path("graphxq/dotml")
%output:method("html") %output:version("5.0")
%restxq:form-param("src","{$src}")
%restxq:query-param("src","{$src}")
function dotmlform($src){

let $svgwidget:=fn:doc("views/widget.svg")
let $toolbar:=fn:doc("views/toolbar.xml")
let $default:=<graph xmlns="http://www.martin-loetzsch.de/DOTML"><node id="test"/></graph>
let $dotml:= getdotml($default ,$src)
let $_:=fn:trace($dotml)
let $dotml:= fn:serialize($dotml)
let $v:=map{ "svgwidget": $svgwidget,
"toolbar": $toolbar,
Expand Down
2 changes: 2 additions & 0 deletions src/graphxq/views/dotform.xq
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@

declare variable $toolbar external :="{tooolbar}";
declare variable $dot external :="{dot}";
declare variable $svgwidget external :="{svg}";

<div class="row-fluid">

<div class="row-fluid" style="height:24px">
Expand Down
2 changes: 1 addition & 1 deletion src/graphxq/views/item1.xq
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ declare variable $url external;

<div class="media-body">
<h4 class="media-heading">
<img src="/graphxq/{$item/url/@type}.png" />
<img src="/static/graphxq/{$item/url/@type}.png" />
{$item/title/fn:string()}
</h4>
{$item/description/node()}
Expand Down
4 changes: 2 additions & 2 deletions src/graphxq/views/layout.xq
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ declare variable $active-link external :=function($_){$_};

<script src="//cdnjs.cloudflare.com/ajax/libs/jquery/1.8.1/jquery.min.js" type="text/javascript"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/2.2.2/bootstrap.min.js" type="text/javascript"></script>
<script src="http://raw.github.com/ajaxorg/ace-builds/master/src-min-noconflict/ace.js" type="text/javascript" charset="utf-8"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.1.8/ace.js" type="text/javascript" charset="utf-8"></script>
<link href="/static/graphxq/app.css" rel="stylesheet" type="text/css" />
<script src="/static/graphxq/app.js" type="text/javascript"></script>
<script type="text/javascript"><![CDATA[
Expand All @@ -48,7 +48,7 @@ declare variable $active-link external :=function($_){$_};
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</a>
<a href="about" class="brand" title="Version 0.4.0">
<a href="about" class="brand" title="Version 0.5.0">
<img src="/static/graphxq/graphxq2.png" />
graphXQ
</a>
Expand Down
1 change: 0 additions & 1 deletion src/static/graphxq/ace-worker/worker-css.js

This file was deleted.

1 change: 0 additions & 1 deletion src/static/graphxq/ace-worker/worker-javascript.js

This file was deleted.

1 change: 0 additions & 1 deletion src/static/graphxq/ace-worker/worker-json.js

This file was deleted.

1 change: 0 additions & 1 deletion src/static/graphxq/ace-worker/worker-xquery.js

This file was deleted.

2 changes: 1 addition & 1 deletion src/static/graphxq/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ function acediv(id){
// https://github.com/ajaxorg/ace/issues/1161
var mode=$("#"+id).attr("data-mode");
var readonly=!!$("#"+id).attr("data-readonly");
ace.config.set("workerPath", "/graphxq/ace-worker");
// ace.config.set("workerPath", "/static/graphxq/ace-worker");
var editor = ace.edit(id);
editor.setTheme("ace/theme/textmate");
editor.getSession().setMode("ace/mode/"+mode);
Expand Down
12 changes: 12 additions & 0 deletions src/static/graphxq/logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 0b19756

Please sign in to comment.