Commit 5e3be4f1 authored by Camil Staps's avatar Camil Staps 🍃

Merge abc-interpreter-instead-of-sapl into...

Merge abc-interpreter-instead-of-sapl into server-and-client-side-svg-rendering-with-abc-interpreter
parent b40749eb
......@@ -8,13 +8,9 @@
<!-- Additional Incidone css -->
<link rel="stylesheet" href="/Incidone.css" type="text/css" >
<!-- Sapl dependencies -->
<script type="text/javascript" src="/js/sapl-utils.js"></script>
<script type="text/javascript" src="/js/sapl-builtin.js"></script>
<script type="text/javascript" src="/js/sapl-dynamic.js"></script>
<script type="text/javascript" src="/js/sapl-itasks.js"></script>
<script type="text/javascript" src="/js/sapl-rt.js"></script>
<script type="text/javascript" src="/js/sapl-support.js"></script>
<!-- ABC interpreter -->
<script type="text/javascript" src="/js/abc-instructions.js"></script>
<script type="text/javascript" src="/js/abc-interpreter.js"></script>
<!-- iTasks framework -->
<script type="text/javascript" src="/js/itasks-core.js"></script>
......@@ -23,13 +19,13 @@
<script type="text/javascript" src="/js/itasks-components-display.js"></script>
<script type="text/javascript" src="/js/itasks-components-selection.js"></script>
<script type="text/javascript" src="/js/itasks-components-container.js"></script>
<script type="text/javascript" src="/js/itasks-js-interface.js"></script>
<!-- load iTasks viewport -->
<script type="text/javascript">
window.onload = function() {
itasks.viewport({syncTitle: true}, document.body);
ABC.loading_promise.finally(function(){
itasks.viewport({syncTitle: true}, document.body);
});
};
</script>
</head>
......
......@@ -7,14 +7,9 @@
<link rel="stylesheet" href="/css/itasks.css" type="text/css" >
<link rel="stylesheet" href="/css/WorkflowAdmin.css" type="text/css" >
<!-- Sapl dependencies -->
<script type="text/javascript" src="/js/sapl-utils.js"></script>
<script type="text/javascript" src="/js/sapl-builtin.js"></script>
<script type="text/javascript" src="/js/sapl-dynamic.js"></script>
<script type="text/javascript" src="/js/sapl-itasks.js"></script>
<script type="text/javascript" src="/js/sapl-rt.js"></script>
<script type="text/javascript" src="/js/sapl-support.js"></script>
<script type="text/javascript" src="/js/sapl-debug.js"></script>
<!-- ABC interpreter -->
<script type="text/javascript" src="/js/abc-instructions.js"></script>
<script type="text/javascript" src="/js/abc-interpreter.js"></script>
<!-- iTasks framework -->
<script type="text/javascript" src="/js/itasks-core.js"></script>
......@@ -23,12 +18,13 @@
<script type="text/javascript" src="/js/itasks-components-display.js"></script>
<script type="text/javascript" src="/js/itasks-components-selection.js"></script>
<script type="text/javascript" src="/js/itasks-components-container.js"></script>
<script type="text/javascript" src="/js/itasks-js-interface.js"></script>
<!-- load iTasks viewport -->
<script type="text/javascript">
window.onload = function() {
itasks.viewport({syncTitle: true}, document.body);
ABC.loading_promise.finally(function(){
itasks.viewport({syncTitle: true}, document.body);
});
};
</script>
</head>
......
......@@ -5,7 +5,6 @@ import StdGeneric
import StdOverloadedList
import Data.Maybe
import Text
import Text.GenJSON
:: *JSWorld = JSWorld
......@@ -226,7 +225,7 @@ where
JSNew cons args
| size args==0
-> size cons+6+l
-> count_array args (size args-1) (size cons+5+size args+5+l)
-> count_array args (size args-1) (size cons+5+size args+l)
JSSel obj attr -> len obj (len attr (l+2))
JSSelPath obj path -> len obj (l+1+size path)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment