Skip to content

Commit

Permalink
Use latest fin
Browse files Browse the repository at this point in the history
  • Loading branch information
marcuswestin committed Aug 7, 2011
1 parent e72a158 commit 0909d76
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 7 deletions.
2 changes: 1 addition & 1 deletion README.md
@@ -1,6 +1,6 @@
git submodule init
git submodule update
cd node_modules/fin/node_modules/socket.io-server/
cd node_modules/fin/
sudo npm install .


Expand Down
2 changes: 1 addition & 1 deletion node_modules/fin
Submodule fin updated 1068 files
2 changes: 2 additions & 0 deletions scripts/configureRequire.js
Expand Up @@ -18,4 +18,6 @@ module.exports = function(requireCompilerOrServer) {

.addPath('browser', srcDir + '/client/browser')
.addFile('browser', srcDir + '/client/browser/browser.js')

.addReplacement("'object' === typeof module ? module.exports : (window.io = {})", "window.io = {}") // from fin
}
2 changes: 1 addition & 1 deletion src/client/ios/WorkScreen.js
Expand Up @@ -40,7 +40,7 @@ module.exports = Class(WorkScreen, function() {
this._taskFocus.style({ position:'absolute', top:0 })
var viewportSize = getViewportSize(this._win)
this._taskTitleInput.style({ width:viewportSize.width, height:viewportSize.height - this._headerHeight })
this._taskTitleInput.getElement().value = this._focusedTask.title.current()
this._taskTitleInput.getElement().value = this._focusedTask.title.getCachedValue()
this._taskTitleInput.getElement().focus()

// var offsetTop = node.getElement().offsetTop,
Expand Down
8 changes: 4 additions & 4 deletions src/data/index.js
@@ -1,6 +1,6 @@
var finOrmAPI = require('fin/lib/orm-api')
var fin = require('fin/lib/orm-api')

finOrmAPI.process({
fin.orm.process({
"Global": {
"allTasks": { id:1, type:"List", of:"Task" }
},
Expand All @@ -16,7 +16,7 @@ finOrmAPI.process({

module.exports = {
setUser: setUser,
taskList: finOrmAPI.global.allTasks,
taskList: fin.orm.global.allTasks,
createTask: createTask
}

Expand All @@ -28,7 +28,7 @@ function setUser(userID) {
function createTask(callback) {
var task = new fin.orm.Task({ title:"A task!", owner:user })
gData.taskList.push(task)
finOrmAPI.waitForGUID(task, function(id) {
task.waitForGUID(function(id) {
callback(task)
})
}

0 comments on commit 0909d76

Please sign in to comment.