Browse Source

Merge branch 'master' of https://github.com/romuloccomp/ratchet

pull/640/head
Romulo Pereira 11 years ago
parent
commit
1578387911
  1. 3
      .travis.yml
  2. 6
      Gruntfile.js
  3. 7
      dist/js/ratchet.js
  4. 2
      dist/js/ratchet.min.js
  5. 4
      docs/_includes/header.html
  6. 4
      docs/components.html
  7. 7
      docs/dist/js/ratchet.js
  8. 2
      docs/dist/js/ratchet.min.js
  9. 2
      docs/examples/app-android-notes/index.html
  10. 2
      docs/examples/app-ios-mail/inbox.html
  11. 2
      docs/examples/app-ios-mail/index.html
  12. 2
      docs/examples/app-movies/choose-theater.html
  13. 2
      docs/examples/app-movies/index.html
  14. 2
      docs/getting-started.html
  15. 2
      docs/one.html
  16. 2
      docs/two.html
  17. 7
      js/push.js
  18. 9
      package.json

3
.travis.yml

@ -9,3 +9,6 @@ install:
- travis_retry gem install --no-document "jekyll:~>1.5.0" "sass:~>3.3.0" - travis_retry gem install --no-document "jekyll:~>1.5.0" "sass:~>3.3.0"
matrix: matrix:
fast_finish: true fast_finish: true
notifications:
slack: heybb:51atQXKR2rpnbohAZ0X1vNbE

6
Gruntfile.js

@ -221,10 +221,8 @@ module.exports = function(grunt) {
failHard: true, failHard: true,
reset: true, reset: true,
relaxerror: [ relaxerror: [
'Bad value apple-mobile-web-app-title for attribute name on element meta: Keyword apple-mobile-web-app-title is not registered.', 'Attribute ontouchstart not allowed on element body at this point.',
'Bad value apple-mobile-web-app-status-bar-style for attribute name on element meta: Keyword apple-mobile-web-app-status-bar-style is not registered.', 'Bad value X-UA-Compatible for attribute http-equiv on element meta.'
'Bad value X-UA-Compatible for attribute http-equiv on element meta.',
'Attribute ontouchstart not allowed on element body at this point.'
] ]
}, },
files: { files: {

7
dist/js/ratchet.js vendored

@ -161,9 +161,10 @@
var maxCacheLength = 20; var maxCacheLength = 20;
var cacheMapping = sessionStorage; var cacheMapping = sessionStorage;
var domCache = {}; var domCache = {};
// Change these to unquoted camelcase in the next major version bump
var transitionMap = { var transitionMap = {
slideIn : 'slide-out', 'slide-in' : 'slide-out',
slideOut : 'slide-in', 'slide-out' : 'slide-in',
fade : 'fade' fade : 'fade'
}; };
@ -378,7 +379,7 @@
url : window.location.href, url : window.location.href,
title : document.title, title : document.title,
timeout : options.timeout, timeout : options.timeout,
transition : null transition : options.transition
}); });
} }

2
dist/js/ratchet.min.js vendored

File diff suppressed because one or more lines are too long

4
docs/_includes/header.html

@ -3,8 +3,8 @@
<title>{{ page.title }}</title> <title>{{ page.title }}</title>
<meta name="description" content="{{ site.name }}: {{ site.description }}"> <meta name="description" content="{{ site.name }}: {{ site.description }}">
<meta name="author" content="{{ site.authors }}"> <meta name="author" content="{{ site.authors }}">
<meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no, minimal-ui"> <meta name="viewport" content="initial-scale=1, maximum-scale=1">
<link rel="icon" href="/favicon.ico"> <link rel="shortcut icon" href="/favicon.ico">
<meta name="apple-mobile-web-app-capable" content="yes"> <meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="black"> <meta name="apple-mobile-web-app-status-bar-style" content="black">

4
docs/components.html

@ -368,8 +368,8 @@ title: Components &middot; Ratchet
{% highlight html %} {% highlight html %}
<ul class="table-view"> <ul class="table-view">
<li class="table-view-cell">Item 1</li> <li class="table-view-cell">Item 1</li>
<li class="table-view-cell table-view-cell">Item 2</li> <li class="table-view-cell">Item 2</li>
<li class="table-view-divider">Divider</li> <li class="table-view-cell table-view-divider">Divider</li>
<li class="table-view-cell">Item 3</li> <li class="table-view-cell">Item 3</li>
</ul> </ul>
{% endhighlight %} {% endhighlight %}

7
docs/dist/js/ratchet.js vendored

@ -161,9 +161,10 @@
var maxCacheLength = 20; var maxCacheLength = 20;
var cacheMapping = sessionStorage; var cacheMapping = sessionStorage;
var domCache = {}; var domCache = {};
// Change these to unquoted camelcase in the next major version bump
var transitionMap = { var transitionMap = {
slideIn : 'slide-out', 'slide-in' : 'slide-out',
slideOut : 'slide-in', 'slide-out' : 'slide-in',
fade : 'fade' fade : 'fade'
}; };
@ -378,7 +379,7 @@
url : window.location.href, url : window.location.href,
title : document.title, title : document.title,
timeout : options.timeout, timeout : options.timeout,
transition : null transition : options.transition
}); });
} }

2
docs/dist/js/ratchet.min.js vendored

File diff suppressed because one or more lines are too long

2
docs/examples/app-android-notes/index.html

@ -3,7 +3,7 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>Notes</title> <title>Notes</title>
<meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no, minimal-ui"> <meta name="viewport" content="initial-scale=1, maximum-scale=1">
<meta name="apple-mobile-web-app-capable" content="yes"> <meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="black"> <meta name="apple-mobile-web-app-status-bar-style" content="black">

2
docs/examples/app-ios-mail/inbox.html

@ -3,7 +3,7 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>Mail</title> <title>Mail</title>
<meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no, minimal-ui"> <meta name="viewport" content="initial-scale=1, maximum-scale=1">
<meta name="apple-mobile-web-app-capable" content="yes"> <meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="black"> <meta name="apple-mobile-web-app-status-bar-style" content="black">

2
docs/examples/app-ios-mail/index.html

@ -3,7 +3,7 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>Mail</title> <title>Mail</title>
<meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no, minimal-ui"> <meta name="viewport" content="initial-scale=1, maximum-scale=1">
<meta name="apple-mobile-web-app-capable" content="yes"> <meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="black"> <meta name="apple-mobile-web-app-status-bar-style" content="black">

2
docs/examples/app-movies/choose-theater.html

@ -3,7 +3,7 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>Movie finder</title> <title>Movie finder</title>
<meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no, minimal-ui"> <meta name="viewport" content="initial-scale=1, maximum-scale=1">
<meta name="apple-mobile-web-app-capable" content="yes"> <meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="black"> <meta name="apple-mobile-web-app-status-bar-style" content="black">

2
docs/examples/app-movies/index.html

@ -3,7 +3,7 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>Movie finder</title> <title>Movie finder</title>
<meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no, minimal-ui"> <meta name="viewport" content="initial-scale=1, maximum-scale=1">
<meta name="apple-mobile-web-app-capable" content="yes"> <meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="black"> <meta name="apple-mobile-web-app-status-bar-style" content="black">

2
docs/getting-started.html

@ -106,7 +106,7 @@ ratchet/
<title>Ratchet template page</title> <title>Ratchet template page</title>
<!-- Sets initial viewport load and disables zooming --> <!-- Sets initial viewport load and disables zooming -->
<meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no, minimal-ui"> <meta name="viewport" content="initial-scale=1, maximum-scale=1">
<!-- Makes your prototype chrome-less once bookmarked to your phone's home screen --> <!-- Makes your prototype chrome-less once bookmarked to your phone's home screen -->
<meta name="apple-mobile-web-app-capable" content="yes"> <meta name="apple-mobile-web-app-capable" content="yes">

2
docs/one.html

@ -6,7 +6,7 @@
<meta name="description" content=""> <meta name="description" content="">
<meta name="author" content=""> <meta name="author" content="">
<meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no"> <meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no">
<link rel="icon" href="favicon.ico"> <link rel="shortcut icon" href="favicon.ico">
<meta name="apple-mobile-web-app-capable" content="yes"> <meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="black"> <meta name="apple-mobile-web-app-status-bar-style" content="black">
<link rel="stylesheet" href="/dist/css/ratchet.min.css"> <link rel="stylesheet" href="/dist/css/ratchet.min.css">

2
docs/two.html

@ -6,7 +6,7 @@
<meta name="description" content=""> <meta name="description" content="">
<meta name="author" content=""> <meta name="author" content="">
<meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no"> <meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no">
<link rel="icon" href="favicon.ico"> <link rel="shortcut icon" href="favicon.ico">
<meta name="apple-mobile-web-app-capable" content="yes"> <meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="black"> <meta name="apple-mobile-web-app-status-bar-style" content="black">
<link rel="stylesheet" href="/dist/css/ratchet.min.css"> <link rel="stylesheet" href="/dist/css/ratchet.min.css">

7
js/push.js

@ -22,9 +22,10 @@
var maxCacheLength = 20; var maxCacheLength = 20;
var cacheMapping = sessionStorage; var cacheMapping = sessionStorage;
var domCache = {}; var domCache = {};
// Change these to unquoted camelcase in the next major version bump
var transitionMap = { var transitionMap = {
slideIn : 'slide-out', 'slide-in' : 'slide-out',
slideOut : 'slide-in', 'slide-out' : 'slide-in',
fade : 'fade' fade : 'fade'
}; };
@ -239,7 +240,7 @@
url : window.location.href, url : window.location.href,
title : document.title, title : document.title,
timeout : options.timeout, timeout : options.timeout,
transition : null transition : options.transition
}); });
} }

9
package.json

@ -26,21 +26,20 @@
"test": "grunt test" "test": "grunt test"
}, },
"devDependencies": { "devDependencies": {
"grunt": "~0.4.4", "grunt": "~0.4.5",
"grunt-contrib-clean": "~0.5.0", "grunt-contrib-clean": "~0.5.0",
"grunt-contrib-concat": "~0.4.0", "grunt-contrib-concat": "~0.4.0",
"grunt-contrib-copy": "~0.5.0", "grunt-contrib-copy": "~0.5.0",
"grunt-contrib-csslint": "~0.2.0", "grunt-contrib-csslint": "~0.2.0",
"grunt-contrib-cssmin": "~0.9.0", "grunt-contrib-cssmin": "~0.9.0",
"grunt-contrib-jshint": "~0.10.0", "grunt-contrib-jshint": "~0.10.0",
"grunt-contrib-nodeunit": "~0.3.3",
"grunt-contrib-sass": "~0.7.3", "grunt-contrib-sass": "~0.7.3",
"grunt-contrib-uglify": "~0.4.0", "grunt-contrib-uglify": "~0.4.0",
"grunt-contrib-watch": "~0.6.1", "grunt-contrib-watch": "~0.6.1",
"grunt-csscomb": "~2.0.1", "grunt-csscomb": "~2.0.1",
"grunt-html-validation": "~0.1.14", "grunt-html-validation": "~0.1.17",
"grunt-jekyll": "~0.4.1", "grunt-jekyll": "~0.4.2",
"grunt-jscs-checker": "~0.4.1", "grunt-jscs-checker": "~0.4.4",
"grunt-sed": "~0.1.1", "grunt-sed": "~0.1.1",
"load-grunt-tasks": "~0.4.0", "load-grunt-tasks": "~0.4.0",
"time-grunt": "~0.3.1" "time-grunt": "~0.3.1"

Loading…
Cancel
Save