Skip to content

Commit 77803c6

Browse files
committed
Merge pull request #165 from enyojs/2.6.0-dev
Merge 2.6.0 dev into master.
2 parents b419dc0 + 83f2049 commit 77803c6

File tree

236 files changed

+11218
-15023
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

236 files changed

+11218
-15023
lines changed

.enyoconfig

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
{
2+
"name": "layout",
3+
"libDir": "lib",
4+
"paths": [],
5+
"libraries": [],
6+
"sources": {},
7+
"targets": {},
8+
"links": [],
9+
"linkAllLibs": false,
10+
"logLevel": "warn",
11+
"production": false,
12+
"devMode": true,
13+
"cache": true,
14+
"resetCache": false,
15+
"trustCache": false,
16+
"cacheFile": ".enyocache",
17+
"clean": false,
18+
"sourceMaps": true,
19+
"externals": true,
20+
"strict": false,
21+
"skip": [],
22+
"library": true,
23+
"wip": false,
24+
"outdir": "dist",
25+
"lessPlugins": [],
26+
"assetRoots": [],
27+
"lessOnlyLess": false,
28+
"minifyCss": false,
29+
"inlineCss": true,
30+
"outCssFile": "output.css",
31+
"outJsFile": "output.js",
32+
"inlineJs": true,
33+
"templateIndex": "",
34+
"watch": false,
35+
"watchPaths": [],
36+
"polling": false,
37+
"pollingInterval": 100,
38+
"headScripts": [],
39+
"tailScripts": [],
40+
"promisePolyfill": false,
41+
"styleOnly": false,
42+
"lessVars": []
43+
}

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
node_modules
2+
dist
3+
.enyocache

.jshintignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
docs/**
1+
docs/**
2+
samples/samples.js

.jshintrc

Lines changed: 24 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,26 @@
11
{
2-
"globals": {
3-
"enyo": true,
4-
"$L": true,
5-
"onyx": true
6-
},
7-
"es3": true,
8-
"evil": false,
9-
"regexdash": true,
10-
"browser": true,
11-
"wsh": false,
12-
"trailing": false,
13-
"sub": true,
14-
"eqnull": true,
15-
"laxbreak": true,
16-
"laxcomma": true,
17-
"curly": true,
18-
"indent": 4,
19-
"newcap": true,
20-
"undef": true,
21-
"unused": "vars"
2+
"globals": {
3+
"global": false,
4+
"require": false,
5+
"exports": true,
6+
"module": true,
7+
"module.exports": true,
8+
"JSON": false
9+
},
10+
"es3": true,
11+
"evil": false,
12+
"regexdash": true,
13+
"browser": true,
14+
"wsh": false,
15+
"trailing": false,
16+
"sub": true,
17+
"eqnull": true,
18+
"laxbreak": true,
19+
"laxcomma": true,
20+
"curly": false,
21+
"indent": 4,
22+
"newcap": false,
23+
"undef": true,
24+
"expr": true,
25+
"unused": "vars"
2226
}

.travis.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1+
sudo: false
12
language: node_js
23
node_js:
3-
- "0.10"
4-
install: "npm -g install jshint"
5-
script: "jshint ."
4+
- "node"
5+
cache:
6+
directories:
7+
- $HOME/.npm

README.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,11 @@ Easing extends `enyo.easing`, by including thirty additional interpolation metho
7676
[Easing sample](https://github.com/enyojs/lib/layout/easing/samples) folder, showing how to implement these methods. View the
7777
[Easing source](https://github.com/enyojs/lib/layout/easing/source/Easing.js) to see a list of supported easing methods.
7878

79+
## Samples
80+
81+
All samples reside in a consolidated sample app for Enyo and its libraries:
82+
[enyo-strawman](https://github.com/enyojs/enyo-strawman)
83+
7984
## Copyright and License Information
8085

8186
Unless otherwise specified, all content, including all source code files and

bower.json

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
{
2+
"name": "enyo-layout",
3+
"main": [
4+
"index.js",
5+
"lib"
6+
],
7+
"version": "2.6.0",
8+
"homepage": "https://github.com/enyojs/layout",
9+
"authors": [
10+
{"name": "EnyoJS Framework Team", "homepage": "http://enyojs.com/"}
11+
],
12+
"description": "",
13+
"moduleType": [
14+
"node"
15+
],
16+
"keywords": [
17+
"JavaScript",
18+
"framework",
19+
"js",
20+
"javascript",
21+
"library",
22+
"enyo",
23+
"enyojs",
24+
"Enyo",
25+
"EnyoJS",
26+
"webos",
27+
"WebOS",
28+
"toolkit",
29+
"components",
30+
"mobile"
31+
],
32+
"license": "Apache-2.0",
33+
"ignore": [
34+
"**/.*",
35+
"node_modules",
36+
"test",
37+
"docs"
38+
]
39+
}

contextual/package.js

Lines changed: 0 additions & 3 deletions
This file was deleted.

contextual/samples/ContextualLayoutSample.html

Lines changed: 0 additions & 25 deletions
This file was deleted.

0 commit comments

Comments
 (0)