Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

merge fixes

  • Loading branch information...
commit 11f0246e5eff7fe364f8f0e66df206e399cf24da 2 parents dd76578 + df28f10
@remy authored
Showing with 6 additions and 7 deletions.
  1. +3 −3 datastore.js
  2. +1 −1  ftw.appcache
  3. +1 −2  index.html
  4. +1 −1  server.js
View
6 datastore.js
@@ -44,12 +44,13 @@ DataStore.prototype = {
// web sql databases
this.dbtype = 'sql';
this.db = openDatabase('Conference Notes', '1.0', 'notes', 5 * 1024 * 1024);
+
this.db.transaction(function(tx) {
tx.executeSql('CREATE TABLE IF NOT EXISTS ' +
'notes(id TEXT PRIMARY KEY ASC, title TEXT, rating INTEGER, date DATE, notes TEXT, updated DATE, url TEXT UNIQUE)', [], callback, callback);
});
} else {
- console.log('you are fucked...');
+ console.log('you are screwed');
}
},
add: function (conf, success, error) {
@@ -138,8 +139,7 @@ DataStore.prototype = {
} else if (this.dbtype == 'sql') {
this.db.transaction(function (tx) {
tx.executeSql('SELECT * FROM notes WHERE id = ?', [id], function (tx, rs) {
- var row = rs.rows.item(0);
- success(row);
+ success(rs.rows.item(0));
}, error);
});
}
View
2  ftw.appcache
@@ -13,4 +13,4 @@ FALLBACK:
NETWORK:
*
-# v5
+# v5
View
3  index.html
@@ -300,7 +300,6 @@ <h1 id="title">Conference</h1>
elements.notes.onchange = change;
-
return {
title: '',
date: '',
@@ -587,4 +586,4 @@ <h1 id="title">Conference</h1>
</script>
</body>
-</html>
+</html>
View
2  server.js
@@ -1,2 +1,2 @@
var connect = require('connect');
-connect.createServer(connect.static(__dirname)).listen(10884);
+connect.createServer(connect.static(__dirname)).listen(10884);
Please sign in to comment.
Something went wrong with that request. Please try again.