Skip to content

Commit

Permalink
code
Browse files Browse the repository at this point in the history
  • Loading branch information
jtangelder committed May 23, 2014
1 parent a1bd6b7 commit 554f8c8
Show file tree
Hide file tree
Showing 34 changed files with 70 additions and 1,506 deletions.
6 changes: 3 additions & 3 deletions .jscsrc
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"requireSpaceAfterKeywords": ["else", "return"],
"disallowSpaceAfterKeywords": ["if", "for", "while", "do", "switch", "try", "catch"],
"disallowLeftStickedOperators": ["?", "+", "-", "/", "*", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="],
"disallowRightStickedOperators": ["?", "+", "/", "*", ":", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="],
"disallowRightStickedOperators": ["?", "/", "*", ":", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="],
"requireRightStickedOperators": ["!"],
"requireLeftStickedOperators": [","],
"disallowImplicitTypeConversion": ["string"],
Expand All @@ -26,12 +26,12 @@
},
"validateIndentation": 4,
"validateQuoteMarks": "'",

"excludeFiles": [
"*.js",
"tests/**",
"docs/**",
"misc/**",
"node_modules/**"
]
}
}
21 changes: 4 additions & 17 deletions Gruntfile.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ module.exports = (grunt) ->
watch:
scripts:
files: ['src/**/*.js']
tasks: ['concat','string-replace','uglify'] #,'jshint','jscs']
tasks: ['concat','string-replace','uglify','jshint','jscs']
options:
interrupt: true

Expand All @@ -68,29 +68,16 @@ module.exports = (grunt) ->
hostname: "0.0.0.0"
port: 8000

qunit:
all: ['tests/unit/**/*.html']

yuidoc:
build:
name: '<%= pkg.title %>'
description: '<%= pkg.description %>'
version: '<%= pkg.version %>'
url: '<%= pkg.homepage %>'
options:
linkNatives: true
paths: 'src/'
outdir: 'docs/'
themedir: 'misc/docstheme/'
mocha:
test: ['tests/unit/**/*.html']

# Load tasks
grunt.loadNpmTasks 'grunt-contrib-concat'
grunt.loadNpmTasks 'grunt-contrib-uglify'
grunt.loadNpmTasks 'grunt-contrib-watch'
grunt.loadNpmTasks 'grunt-contrib-jshint'
grunt.loadNpmTasks 'grunt-contrib-connect'
grunt.loadNpmTasks 'grunt-contrib-qunit'
grunt.loadNpmTasks 'grunt-contrib-yuidoc'
grunt.loadNpmTasks 'grunt-mocha'
grunt.loadNpmTasks 'grunt-string-replace'
grunt.loadNpmTasks 'grunt-jscs-checker'

Expand Down
7 changes: 3 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# Development for 2.0.0

### Goals
- Multi-user
- Usage of the `touch-action` property
- Better performance
- Session history
- Enable detection of multiple gestures the same time. This makes it multi-user.
- Usage of the `touch-action` property, and a fallback (polyfill) for browsers that don't support the property.
- Session history
Binary file removed misc/docstheme/assets/css/external-small.png
Binary file not shown.
Loading

0 comments on commit 554f8c8

Please sign in to comment.