chore: renamed flag to --skip-absolute-urls

pathable · Apr 6, 2016 · 825ec60 · 825ec60
1 parent 15e6b0d
commit 825ec60
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 14 deletions.
diff --git a/cli/options.js b/cli/options.js
@@ -12,7 +12,7 @@ function options(args) {
       'noimages',
       'nocompress',
       'nosvg',
-      'same-origin-only',
+      'skip-absolute-urls',
       'videos',
       'inlinemin',
     ],
@@ -41,8 +41,8 @@ function options(args) {
     argv.compressJS = false;
     argv.collapseWhitespace = false;
   }
-  if (argv['same-origin-only']) {
-    argv.sameOriginOnly = true;
+  if (argv['skip-absolute-urls']) {
+    argv.skipAbsoluteUrls = true;
   }
   argv.images = !argv.noimages;
 

diff --git a/docs/usage.txt b/docs/usage.txt
@@ -11,12 +11,12 @@
     -i, --noimages      don't encode images - keeps files size small, but more requests
     -o, --videos        encode videos (and their poster image) - disabled by default
     -s, --nosvg         don't compress SVG (through SVGO)
-        --same-origin-only
-                        don't inline files with URLs on other hosts (only local files)
     -v, --verbose       echo on STDERR the progress of inlining
     -V, --version       output the version number
     -h, --help          output usage information
     -m, --inlinemin     inline minified files
+    --skip-absolute-urls
+                        don't inline files with fully-qualified absolute URLs
 
   Options:
 

diff --git a/lib/defaults.js b/lib/defaults.js
@@ -5,6 +5,6 @@ module.exports = function () {
     compressJS: true,
     collapseWhitespace: true,
     nosvg: false, // by default, DO compress SVG with SVGO
-    sameOriginOnly: false,
+    skipAbsoluteUrls: false,
   };
 };
diff --git a/lib/tasks/images.js b/lib/tasks/images.js
@@ -6,7 +6,7 @@ function resolve(inliner, todo, $) {
   return todo.map(function images(image) {
     var url = inliner.resolve(inliner.url, $(image).attr('src'));
 
-    if (inliner.options.sameOriginOnly &&
+    if (inliner.options.skipAbsoluteUrls &&
         (url.indexOf('//') === 0 || url.indexOf('http') === 0)) {
       debug('skipping remote image');
       inliner.emit('progress', 'skipping remote image');

diff --git a/lib/tasks/js.js b/lib/tasks/js.js
@@ -32,7 +32,7 @@ function resolve(inliner, todo, $) {
         inliner.emit('progress', 'skipping analytics script');
         // ignore analytics
         return false;
-      } else if (inliner.options.sameOriginOnly &&
+      } else if (inliner.options.skipAbsoluteUrls &&
                  (src.indexOf('//') === 0 || src.indexOf('http') === 0)) {
         debug('skipping remote scripts');
         inliner.emit('progress', 'skipping remote script');

diff --git a/lib/tasks/links.js b/lib/tasks/links.js
@@ -8,7 +8,7 @@ function resolve(inliner, todo, $) {
     if (url.indexOf('http') !== 0) {
       url = inliner.resolve(inliner.url, url);
     }
-    if (inliner.options.sameOriginOnly &&
+    if (inliner.options.skipAbsoluteUrls &&
         (url.indexOf('//') === 0 || url.indexOf('http') === 0)) {
       debug('skipping remote links');
       inliner.emit('progress', 'skipping remote links');

diff --git a/lib/tasks/videos.js b/lib/tasks/videos.js
@@ -7,7 +7,7 @@ function resolve(inliner, todo, $) {
     var url = inliner.resolve(inliner.url, $(video).attr('src'));
     var posterUrl = inliner.resolve(inliner.url, $(video).attr('poster'));
 
-    if (inliner.options.sameOriginOnly &&
+    if (inliner.options.skipAbsoluteUrls &&
         (url.indexOf('//') === 0 || url.indexOf('http') === 0)) {
       debug('skipping remote video');
       inliner.emit('progress', 'skipping remote video');

diff --git a/test/fixtures/inline-same-origin-only.opts.json b/test/fixtures/inline-same-origin-only.opts.json
diff --git a/test/fixtures/inline-skip-absolute-urls.opts.json b/test/fixtures/inline-skip-absolute-urls.opts.json
@@ -0,0 +1,4 @@
+{
+    "skipAbsoluteUrls": true,
+    "videos": true
+}
diff --git a/...tures/inline-same-origin-only.result.html → ...res/inline-skip-absolute-urls.result.html b/...tures/inline-same-origin-only.result.html → ...res/inline-skip-absolute-urls.result.html
diff --git a/...fixtures/inline-same-origin-only.src.html → ...xtures/inline-skip-absolute-urls.src.html b/...fixtures/inline-same-origin-only.src.html → ...xtures/inline-skip-absolute-urls.src.html