Permalink
Browse files

Merge branch 'v2.0' into v2.0-rename-method

Conflicts:
	build/mobify.js
	build/mobify.min.js
	src/capture.js
  • Loading branch information...
jansepar committed Mar 4, 2014
2 parents 40b52e3 + 21f0bce commit 2b2410a4ddf6698b74d5bbdc9c5d0ef1897d9e32
Showing with 7,946 additions and 415 deletions.
  1. +1 −0 .gitignore
  2. +13 −0 CHANGELOG
  3. +74 −2 Gruntfile.js
  4. +1 −1 bower.json
  5. +366 −73 build/mobify.js
  6. +1 −1 build/mobify.min.js
  7. +31 −29 examples/capturing-grumpycat/index.html
  8. +3 −1 mobify-custom.js.example
  9. +1 −1 package.json
  10. +29 −0 server.js
  11. +70 −36 src/capture.js
  12. +112 −0 src/patchAnchorLinks.js
  13. +87 −21 src/resizeImages.js
  14. +71 −2 src/utils.js
  15. +33 −0 tag/supportedBrowser.js
  16. +3 −0 tag/v7.exposed.min.js
  17. +358 −0 tag/v7.js
  18. +3 −0 tag/v7.min.js
  19. +176 −0 tests/anchor-test.html
  20. +183 −49 tests/capture.html
  21. +102 −0 tests/fixtures/anchor-test.html
  22. +31 −0 tests/fixtures/meta.html
  23. +16 −0 tests/fixtures/plaintext-above-head-example.html
  24. +16 −0 tests/fixtures/plaintext-comment-example.html
  25. +2 −2 tests/fixtures/plaintext-example.html
  26. +16 −0 tests/fixtures/plaintext-malformed-markup-example.html
  27. +14 −0 tests/fixtures/plaintext-no-end-head-example.html
  28. +15 −0 tests/fixtures/tag.html
  29. +23 −0 tests/fixtures/tag/always-run.html
  30. +24 −0 tests/fixtures/tag/desktop.html
  31. +5 −0 tests/fixtures/tag/desktop.js
  32. +23 −0 tests/fixtures/tag/disabled.html
  33. +5 −0 tests/fixtures/tag/dont-load.js
  34. +25 −0 tests/fixtures/tag/failed-load-tag.html
  35. +5 −0 tests/fixtures/tag/mobile.js
  36. +15 −0 tests/fixtures/tag/no-run.html
  37. +34 −0 tests/fixtures/tag/postload.html
  38. +32 −0 tests/fixtures/tag/preload.html
  39. +24 −0 tests/fixtures/tag/preview.html
  40. +5 −0 tests/fixtures/tag/preview.js
  41. +26 −0 tests/fixtures/tag/project1-0.html
  42. +11 −0 tests/fixtures/tag/project1-0/README.md
  43. +1 −0 tests/fixtures/tag/project1-0/bld/mobify.js
  44. +1 −0 tests/fixtures/tag/project1-0/bld/style.css
  45. +10 −0 tests/fixtures/tag/project1-0/project.json
  46. +56 −0 tests/fixtures/tag/project1-0/src/mobify.konf
  47. +29 −0 tests/fixtures/tag/project1-0/src/style.css
  48. +3 −0 tests/fixtures/tag/project1-0/src/tmpl/_footer.tmpl
  49. +11 −0 tests/fixtures/tag/project1-0/src/tmpl/_header.tmpl
  50. +86 −0 tests/fixtures/tag/project1-0/src/tmpl/base.tmpl
  51. +14 −0 tests/fixtures/tag/project1-0/src/tmpl/home.tmpl
  52. +27 −0 tests/fixtures/tag/project1-1.html
  53. +11 −0 tests/fixtures/tag/project1-1/README.md
  54. +1 −0 tests/fixtures/tag/project1-1/bld/mobify.js
  55. +4,286 −0 tests/fixtures/tag/project1-1/mobify.js
  56. +10 −0 tests/fixtures/tag/project1-1/project.json
  57. +55 −0 tests/fixtures/tag/project1-1/src/mobify.konf
  58. +3 −0 tests/fixtures/tag/project1-1/src/tmpl/_footer.tmpl
  59. +11 −0 tests/fixtures/tag/project1-1/src/tmpl/_header.tmpl
  60. +85 −0 tests/fixtures/tag/project1-1/src/tmpl/base.tmpl
  61. +14 −0 tests/fixtures/tag/project1-1/src/tmpl/home.tmpl
  62. +43 −0 tests/fixtures/tag/project2-0.html
  63. +19 −0 tests/fixtures/tag/single-mode.html
  64. +28 −0 tests/fixtures/tag/skip-preview.html
  65. +30 −0 tests/fixtures/tag/useragent.html
  66. +0 −51 tests/mobify-library.html
  67. +260 −123 tests/resizeImages.html
  68. +69 −0 tests/supported-browser.html
  69. +332 −0 tests/tag-integration-tests.html
  70. +64 −0 tests/tag-old-browser.html
  71. +146 −0 tests/tag.html
  72. +46 −15 tests/utils.html
  73. +59 −0 tests/utils/proxyassert.js
  74. +2 −1 www/_includes/nav-docsv2.md
  75. +1 −1 www/docs/konf-reference.md
  76. +38 −0 www/v2/docs/capturing.md
  77. +8 −4 www/v2/docs/image-resizer.md
  78. +2 −2 www/v2/docs/index.md
View
@@ -8,3 +8,4 @@ node_modules
*.gz
build/mobify-experimental*
report.xml
+localConfig.json
View
@@ -0,0 +1,13 @@
+2.0.7 - Allow specifying quality parameter without it defaulting the format
+ to JPG.
+ Added a flag that allows you to turn resizing to auto/on/off.
+2.0.6 - Fixed issue where we were not passing in the prefix when
+ using `render` with an HTML string, causing assets to not get enabled.
+2.0.5 - Add API for fixing Anchor Tags on Firefox when using Capturing.
+2.0.4 - Fixes iOS 4.3 / Safari 4 issue with placing Mobify tag above <head>.
+2.0.3 - Adds a fix to ensure that meta tags do not get created and inserted
+ into the <head> for older Safari browsers.
+2.0.2 - Fixes iOS 4.3 / Safari 4 issue with document.head being undefined.
+2.0.1 - Changes getImageURL to grab default options if options object is not
+ passed to it.
+2.0.0 - First stable release of 2.0 API!
View
@@ -27,12 +27,17 @@ module.exports = function(grunt) {
options: {
timeout: 20000,
urls: [
- 'http://localhost:3000/tests/mobify-library.html',
'http://localhost:3000/tests/capture.html',
'http://localhost:3000/tests/jazzcat.html',
'http://localhost:3000/tests/resizeImages.html',
'http://localhost:3000/tests/unblockify.html',
'http://localhost:3000/tests/cssOptimize.html',
+ 'http://localhost:3000/tests/anchor-test.html',
+ 'http://localhost:3000/tests/supported-browser.html',
+ 'http://localhost:3000/tests/tag.html',
+ 'http://localhost:3000/tests/tag-integration-tests.html',
+ 'http://localhost:3000/tests/tag-old-browser.html',
+ 'http://localhost:3000/tests/utils.html'
]
}
}
@@ -97,12 +102,16 @@ module.exports = function(grunt) {
username: '<%= localConfig.saucelabs.username %>', // if not provided it'll default to ENV SAUCE_USERNAME (if applicable)
key: '<%= localConfig.saucelabs.key %>', // if not provided it'll default to ENV SAUCE_ACCESS_KEY (if applicable)
urls: [
- 'http://localhost:3000/tests/mobify-library.html',
'http://localhost:3000/tests/capture.html',
'http://localhost:3000/tests/resizeImages.html',
'http://localhost:3000/tests/jazzcat.html',
'http://localhost:3000/tests/unblockify.html',
'http://localhost:3000/tests/cssOptimize.html',
+ 'http://localhost:3000/tests/anchor-test.html',
+ 'http://localhost:3000/tests/supported-browser.html',
+ 'http://localhost:3000/tests/tag.html',
+ 'http://localhost:3000/tests/tag-integration-tests.html',
+ 'http://localhost:3000/tests/utils.html'
],
concurrency: 16,
tunneled: true,
@@ -190,6 +199,59 @@ module.exports = function(grunt) {
// Return true or false, passes or fails the test
// Returning undefined does not alter the test result
+ // For async return, call
+ var done = this.async();
+ setTimeout(function(){
+ // Return to this test after 1000 milliseconds
+ done(/*true or false changes the test result, undefined does not alter the result*/);
+ }, 1000);
+ }
+ }
+ },
+
+ oldbrowsers: {
+ options: {
+ username: '<%= localConfig.saucelabs.username %>', // if not provided it'll default to ENV SAUCE_USERNAME (if applicable)
+ key: '<%= localConfig.saucelabs.key %>', // if not provided it'll default to ENV SAUCE_ACCESS_KEY (if applicable)
+ urls: [
+ 'http://localhost:3000/tests/tag-old-browser.html',
+ 'http://localhost:3000/tests/supported-browser.html'
+ ],
+ concurrency: 16,
+ tunneled: true,
+ detailedError: true,
+ browsers: [ //https://saucelabs.com/docs/platforms
+ {
+ browserName: 'internet explorer',
+ platform: 'Windows XP',
+ version: '6'
+ },
+ {
+ browserName: 'internet explorer',
+ platform: 'Windows XP',
+ version: '7'
+ },
+ {
+ browserName: 'internet explorer',
+ platform: 'Windows XP',
+ version: '8'
+ },
+ {
+ browserName: 'firefox',
+ platform: 'Windows XP',
+ version: '3.6'
+ },
+ {
+ browserName: 'opera',
+ platform: 'Windows XP',
+ version: '11'
+ }
+ ], // https://saucelabs.com/docs/browsers
+ onTestComplete: function(){
+ // Called after a qunit unit is done, per page, per browser
+ // Return true or false, passes or fails the test
+ // Returning undefined does not alter the test result
+
// For async return, call
var done = this.async();
setTimeout(function(){
@@ -218,6 +280,11 @@ module.exports = function(grunt) {
src: "build/mobify.js",
dest: "mobifyjs/build/mobify-<%= pkg.version %>.js",
rel: "build",
+ },
+ { // unminified dev build to latest
+ src: "build/mobify.js",
+ dest: "mobifyjs/build/mobify.js",
+ rel: "build",
}
]
},
@@ -231,6 +298,11 @@ module.exports = function(grunt) {
src: "build/mobify.min.js",
dest: "mobifyjs/build/mobify-<%= pkg.version %>.min.js",
rel: "build",
+ },
+ { // minified production build to latest
+ src: "build/mobify.min.js",
+ dest: "mobifyjs/build/mobify.min.js",
+ rel: "build",
}
]
},
View
@@ -1,6 +1,6 @@
{
"name": "mobifyjs",
- "version": "2.0.1",
+ "version": "2.0.7",
"main": "build/mobify.min.js",
"ignore": [
"node_modules",
Oops, something went wrong.

0 comments on commit 2b2410a

Please sign in to comment.