Permalink
Browse files

Merge branch 'statusjs'

  • Loading branch information...
cdent committed Jul 3, 2012
2 parents b0e72a7 + 2f7e881 commit fb95547375719996345e4f45fc5947911427770f
View
@@ -26,6 +26,7 @@
'setuptools',
'tiddlyweb>=1.2.51',
'tiddlywebwiki>=0.57.0',
+ 'tiddlywebplugins.status>=0.6',
'tiddlywebplugins.utils>=1.0',
'tiddlywebplugins.logout>=0.6',
'tiddlywebplugins.virtualhosting',
View
@@ -75,6 +75,7 @@ _cache-max-age: 43200
<script type="text/javascript" src="/bags/common/tiddlers/chrjs.space"></script>
<script type="text/javascript" src="/bags/common/tiddlers/chrjs.identities"></script>
<script type="text/javascript" src="/bags/common/tiddlers/ts.js"></script>
+<script src="/status.js"></script>
<script type="text/javascript">
if(window.location.hash === "#refreshParent") {
window.location.hash = "";
@@ -29,10 +29,9 @@ type: text/html
<script type='text/javascript' src='/bags/common/tiddlers/chrjs.space'></script>
<script type='text/javascript' src='/bags/common/tiddlers/chrjs.users'></script>
<script src="/bags/common/tiddlers/ts.js" type="text/javascript" charset="utf-8"></script>
+<script src="/status.js"></script>
<script type="text/javascript">
- $(document).ready(function() {
- ts.init(function() {}, { space: "" });
- });
+ ts.init(function() {}, { space: "" });
</script>
</body>
</html>
@@ -85,6 +85,7 @@ tags: excludeLists excludeSearch excludeMissing
<script type='text/javascript' src='/bags/common/tiddlers/jquery-form.js'></script>
<script type='text/javascript' src="/bags/common/tiddlers/siteiconupload.js"></script>
<script type='text/javascript' src='/bags/common/tiddlers/ts.js'></script>
+<script src="/status.js"></script>
<script type="text/javascript">
/*
* jQuery UI Autocomplete HTML Extension
@@ -80,6 +80,7 @@ tags: excludeLists excludeSearch excludeMissing
<script type='text/javascript' src='/bags/common/tiddlers/jquery-form.js'></script>
<script type='text/javascript' src="/bags/common/tiddlers/siteiconupload.js"></script>
<script type='text/javascript' src="/bags/common/tiddlers/ts.js"></script>
+<script src="/status.js"></script>
<script type="text/javascript">
ts.init(function(ts) {
if(!ts.currentSpace) {

0 comments on commit fb95547

Please sign in to comment.