1
0
mirror of /repos/Prototyper.git synced 2025-12-30 06:31:32 +01:00

minor tweaks

This commit is contained in:
Aiko Mastboom 2013-04-21 00:35:44 +02:00
parent 98dd57d695
commit 15c8905f80
4 changed files with 11 additions and 6 deletions

View File

@ -138,7 +138,7 @@ module.exports = function (config, mongoInstance, sharemodel) {
if (context.attribute == "json") {
var data = null;
try {
data = JSON.parse(remainder);
data = JSON.parse(remainder);
} catch (err) {
config.errors && console.log('ERR importer.replaceMarkers JSON.parse(remainder)', remainder, err);
return callback(err);

View File

@ -11,6 +11,7 @@ mkdir -p ./public/lib/knockout
if [ ! -f ./public/lib/knockout/knockout.mapping-latest.js ]; then
cd ./public/lib/knockout
curl -O https://raw.github.com/SteveSanderson/knockout.mapping/master/build/output/knockout.mapping-latest.js
curl -O https://raw.github.com/billpull/knockout-bootstrap/master/build/knockout-bootstrap.min.js
cd ${current_dir}
fi

View File

@ -1,4 +1,4 @@
<!DOCTYPE html><!-- @@import__app_main_json_ -->
<!DOCTYPE html><!-- @@remove_ --><!-- @@import__app_main_json_ -->
{ "_availableModes" : [
{ "name": "none", "ace":"none" },
{ "name": "HTML", "ace":"html" },
@ -18,12 +18,15 @@
<!-- @@remove_ -->
<link href="/style.css" rel="stylesheet" type="text/css">
<!-- @@_end_remove -->
<!-- @@style__app_main_style -->
<link href="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.1/css/bootstrap-combined.min.css" rel="stylesheet" type="text/css">
<link href="//netdna.bootstrapcdn.com/font-awesome/3.0.2/css/font-awesome.css" rel="stylesheet" type="text/css">
<!-- @@style_ _app_main_style -->
</head>
<body>
<!-- @@template__app_main_body__context__app_main -->
<!-- @@import__app_main_body_ -->
<div class="container">
<div id="header">
<div id="htext">
Editing <b>index</b>
@ -46,7 +49,7 @@
</div>
<div id="editor"></div>
</div>
<!-- @@template__app_main_scripts__context__app_main -->
<!-- @@import__app_main_scripts_ -->
<script src="//cdnjs.cloudflare.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
@ -57,9 +60,10 @@
<script src="//cdnjs.cloudflare.com/ajax/libs/knockout/2.2.1/knockout-min.js"></script>
<script src="//underscorejs.org/underscore-min.js"></script>
<!--<script src="//raw.github.com/SteveSanderson/knockout.mapping/master/build/output/knockout.mapping-latest.debug.js"></script>-->
<script src="//raw.github.com/SteveSanderson/knockout.mapping/master/build/output/knockout.mapping-latest.js"></script>
<script src="/lib/knockout/knockout.mapping-latest.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/knockout-validation/1.0.2/knockout.validation.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/2.3.1/js/bootstrap.min.js"></script>
<script src="/lib/knockout/knockout-bootstrap.min.js"></script>
<script src="/lib/markdown/markdown.js" type="text/javascript" charset="utf-8"></script>
<script src="/lib/ace/ace.js" type="text/javascript" charset="utf-8"></script>
<script src="/lib/ace/mode-html.js" type="text/javascript" charset="utf-8"></script>

View File

@ -38,6 +38,6 @@ app.use('/lib/ace', express.static(config.ace_client));
var server = instance(app, config);
server.listen(config.port, function (err) {
config.debug && console.log('routes', server.routes);
config.debug && console.log('routes', app.routes);
console.log('Server running at http://127.0.0.1:', config.port);
});