diff --git a/package.json b/package.json index f802a7cbd2..997344b01d 100644 --- a/package.json +++ b/package.json @@ -27,6 +27,7 @@ "icalendar": "git://github.com/lefnire/node-icalendar#master", "js2xmlparser": "~0.1.2", "lodash": "~2.4.1", + "jade": "~1.7.0", "method-override": "~2.2.0", "mongoose": "~3.8.17", "moment": "~2.8.3", diff --git a/views/index.jade b/views/index.jade index a6d92ad08f..802e3873eb 100644 --- a/views/index.jade +++ b/views/index.jade @@ -1,4 +1,4 @@ -doctype 5 +doctype html //html(ng-app="habitrpg", ng-controller="RootCtrl", ng-class='{"applying-action":applyingAction}', ui-keypress="{27:'castCancel()'}") html(ng-app="habitrpg", ng-controller="RootCtrl", ng-class='{"applying-action":applyingAction}', ui-keyup="{27:'castCancel()'}") head diff --git a/views/shared/tasks/task.jade b/views/shared/tasks/task.jade index 28487fb2ce..70dc518598 100644 --- a/views/shared/tasks/task.jade +++ b/views/shared/tasks/task.jade @@ -137,7 +137,8 @@ li(bindonce='list', bo-id='"task-"+task.id', ng-repeat='task in obj[list.type+"s a.pull-right.checklist-icons(ng-click='removeChecklistItem(task,$event,$index,true)') span.glyphicon.glyphicon-trash(tooltip=env.t('delete')) input(type='checkbox',ng-model='item.completed',ng-change='saveTask(task,true)') - input.inline-edit(type='text',ng-model='item.text',ui-keydown="{'8 46':'removeChecklistItem(task,$event,$index)'}",ui-keyup="{'13':'addChecklistItem(task,$event,$index)','38 40':'navigateChecklist(task,$index,$event)'}")//-,ng-blur='saveTask(task,true)') + //-,ng-blur='saveTask(task,true)') + input.inline-edit(type='text',ng-model='item.text',ui-keydown="{'8 46':'removeChecklistItem(task,$event,$index)'}",ui-keyup="{'13':'addChecklistItem(task,$event,$index)','38 40':'navigateChecklist(task,$index,$event)'}") form(ng-submit='saveTask(task)') diff --git a/views/static/layout.jade b/views/static/layout.jade index 11fe1ffa87..e03565a4ab 100644 --- a/views/static/layout.jade +++ b/views/static/layout.jade @@ -1,6 +1,6 @@ //-Trick needed to pass 'env' to ./layout block vars -doctype 5 +doctype html html(ng-app='habitrpgStatic') head diff --git a/views/static/new-stuff.jade b/views/static/new-stuff.jade index 54f0f5e70a..9cbf77b87f 100644 --- a/views/static/new-stuff.jade +++ b/views/static/new-stuff.jade @@ -1,5 +1,5 @@ block vars -doctype 5 +doctype html html(ng-app='habitrpgStatic') head