Merge pull request #98 from SciTools-incubator/webp_group_bugfix

Webp group bugfix
SciTools-incubator · Mar 9, 2018 · 600b2e6 · 600b2e6
2 parents caf02c9 + dbf9299
commit 600b2e6
Show file tree

Hide file tree

Showing 21 changed files with 101 additions and 87 deletions.
diff --git a/ImageMetaTag/__init__.py b/ImageMetaTag/__init__.py
@@ -21,7 +21,7 @@
 '''
 
 # see release_process for details on incrementing the version
-__version__ = '0.6.11'
+__version__ = '0.6.12'
 __documentation__ = 'http://scitools-incubator.github.io/image-meta-tag/build/html/'
 
 # list fo file formats which are valid for saving metadata to:

diff --git a/ImageMetaTag/javascript/imt_dropdown.js b/ImageMetaTag/javascript/imt_dropdown.js
@@ -1,4 +1,4 @@
-// ImageMetaTag dropdown menu scripting - vn0.6.11
+// ImageMetaTag dropdown menu scripting - vn0.6.12
 // ImageMetaTag is a python package built around a wrapper for savefig in 
 // matplotlib, which adds metadata tags to supported image file formats.
 // See https://github.com/SciTools-incubator/image-meta-tag for details.
@@ -303,15 +303,29 @@ function update_selector(depth, options, selected) {
 		// now within the optgroup, add the options:
 		for (var i_opt=0, n_opt=optgroup.length; i_opt< n_opt; i_opt++){
 		    // loop over the options, and write out a line for each one:
-		    for (var j_opt=0, len_j=key_lists[depth].length; j_opt < len_j; j_opt++){
+		    //
+		    // first determine if this element of the group is valid for the current
+		    // selection:
+		    var opt_in_options=Boolean(false);
+		    for (var j_opt=0, len_j=options.length; j_opt < len_j; j_opt++){
 			// first, get the index in key_lists[depth] to which i_opt refers
 			// as not every option is used in every selection:
-			if (key_lists[depth][j_opt] == optgroup[i_opt]){break};
+			if (options[j_opt] == optgroup[i_opt]){
+			    opt_in_options=Boolean(true);
+			    break;
+			};
 		    };
-		    if (optgroup[i_opt] == selected){
-			sel_text += "  <option value=" + j_opt + " selected=selected>"+optgroup[i_opt]+"</option>\n";
-		    } else {
-			sel_text += "  <option value=" + j_opt + ">"+optgroup[i_opt]+"</option>\n";
+		    if (opt_in_options){
+			// now work out the j_opt that's index of key_lists[depth], because that's what's needed
+			// for the selector:
+			for (var j_opt=0, len_j=key_lists[depth].length; j_opt < len_j; j_opt++){
+			    if (key_lists[depth][j_opt] == optgroup[i_opt]){break;};
+			};
+			if (optgroup[i_opt] == selected){
+			    sel_text += "  <option value=" + j_opt + " selected=selected>"+optgroup[i_opt]+"</option>\n";
+			} else {
+			    sel_text += "  <option value=" + j_opt + ">"+optgroup[i_opt]+"</option>\n";
+			};
 		    };
 		};
 		// close the optgroup:

diff --git a/docs/build/doctrees/environment.pickle b/docs/build/doctrees/environment.pickle
diff --git a/docs/build/html/.buildinfo b/docs/build/html/.buildinfo
@@ -1,4 +1,4 @@
 # Sphinx build info version 1
 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
-config: fdcbb4bb15063786a80ea119d0108298
+config: bdfaf075f5f44994bc4c99cd16c184db
 tags: 645f666f9bcd5a90fca523b33c5a78b7
diff --git a/docs/build/html/ImageDict.html b/docs/build/html/ImageDict.html
@@ -6,15 +6,15 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 
-    <title>ImageMetaTag.ImageDict &mdash; ImageMetaTag 0.6.11 documentation</title>
+    <title>ImageMetaTag.ImageDict &mdash; ImageMetaTag 0.6.12 documentation</title>
 
     <link rel="stylesheet" href="_static/sphinxdoc.css" type="text/css" />
     <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
 
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    './',
-        VERSION:     '0.6.11',
+        VERSION:     '0.6.12',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -23,7 +23,7 @@
     <script type="text/javascript" src="_static/jquery.js"></script>
     <script type="text/javascript" src="_static/underscore.js"></script>
     <script type="text/javascript" src="_static/doctools.js"></script>
-    <link rel="top" title="ImageMetaTag 0.6.11 documentation" href="index.html" />
+    <link rel="top" title="ImageMetaTag 0.6.12 documentation" href="index.html" />
     <link rel="next" title="ImageMetaTag.webpage" href="webpage.html" />
     <link rel="prev" title="ImageMetaTag.db" href="db.html" /> 
   </head>
@@ -43,7 +43,7 @@ <h3>Navigation</h3>
         <li class="right" >
           <a href="db.html" title="ImageMetaTag.db"
              accesskey="P">previous</a> |</li>
-        <li><a href="index.html">ImageMetaTag 0.6.11 documentation</a> &raquo;</li> 
+        <li><a href="index.html">ImageMetaTag 0.6.12 documentation</a> &raquo;</li> 
       </ul>
     </div>
       <div class="sphinxsidebar">
@@ -399,7 +399,7 @@ <h3>Navigation</h3>
         <li class="right" >
           <a href="db.html" title="ImageMetaTag.db"
              >previous</a> |</li>
-        <li><a href="index.html">ImageMetaTag 0.6.11 documentation</a> &raquo;</li> 
+        <li><a href="index.html">ImageMetaTag 0.6.12 documentation</a> &raquo;</li> 
       </ul>
     </div>
     <div class="footer">

diff --git a/docs/build/html/_modules/ImageMetaTag.html b/docs/build/html/_modules/ImageMetaTag.html
@@ -6,15 +6,15 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 
-    <title>ImageMetaTag &mdash; ImageMetaTag 0.6.11 documentation</title>
+    <title>ImageMetaTag &mdash; ImageMetaTag 0.6.12 documentation</title>
 
     <link rel="stylesheet" href="../_static/sphinxdoc.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
 
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '0.6.11',
+        VERSION:     '0.6.12',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -23,7 +23,7 @@
     <script type="text/javascript" src="../_static/jquery.js"></script>
     <script type="text/javascript" src="../_static/underscore.js"></script>
     <script type="text/javascript" src="../_static/doctools.js"></script>
-    <link rel="top" title="ImageMetaTag 0.6.11 documentation" href="../index.html" />
+    <link rel="top" title="ImageMetaTag 0.6.12 documentation" href="../index.html" />
     <link rel="up" title="Module code" href="index.html" /> 
   </head>
   <body>
@@ -36,7 +36,7 @@ <h3>Navigation</h3>
         <li class="right" >
           <a href="../py-modindex.html" title="Python Module Index"
              >modules</a> |</li>
-        <li><a href="../index.html">ImageMetaTag 0.6.11 documentation</a> &raquo;</li>
+        <li><a href="../index.html">ImageMetaTag 0.6.12 documentation</a> &raquo;</li>
           <li><a href="index.html" accesskey="U">Module code</a> &raquo;</li> 
       </ul>
     </div>
@@ -90,7 +90,7 @@ <h1>Source code for ImageMetaTag</h1><div class="highlight"><pre>
 <span class="sd">&#39;&#39;&#39;</span>
 
 <span class="c"># see release_process for details on incrementing the version</span>
-<span class="n">__version__</span> <span class="o">=</span> <span class="s">&#39;0.6.11&#39;</span>
+<span class="n">__version__</span> <span class="o">=</span> <span class="s">&#39;0.6.12&#39;</span>
 <span class="n">__documentation__</span> <span class="o">=</span> <span class="s">&#39;http://scitools-incubator.github.io/image-meta-tag/build/html/&#39;</span>
 
 <span class="c"># list fo file formats which are valid for saving metadata to:</span>
@@ -123,7 +123,7 @@ <h3>Navigation</h3>
         <li class="right" >
           <a href="../py-modindex.html" title="Python Module Index"
              >modules</a> |</li>
-        <li><a href="../index.html">ImageMetaTag 0.6.11 documentation</a> &raquo;</li>
+        <li><a href="../index.html">ImageMetaTag 0.6.12 documentation</a> &raquo;</li>
           <li><a href="index.html" >Module code</a> &raquo;</li> 
       </ul>
     </div>

diff --git a/docs/build/html/_modules/ImageMetaTag/db.html b/docs/build/html/_modules/ImageMetaTag/db.html
@@ -6,15 +6,15 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 
-    <title>ImageMetaTag.db &mdash; ImageMetaTag 0.6.11 documentation</title>
+    <title>ImageMetaTag.db &mdash; ImageMetaTag 0.6.12 documentation</title>
 
     <link rel="stylesheet" href="../../_static/sphinxdoc.css" type="text/css" />
     <link rel="stylesheet" href="../../_static/pygments.css" type="text/css" />
 
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../../',
-        VERSION:     '0.6.11',
+        VERSION:     '0.6.12',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -23,7 +23,7 @@
     <script type="text/javascript" src="../../_static/jquery.js"></script>
     <script type="text/javascript" src="../../_static/underscore.js"></script>
     <script type="text/javascript" src="../../_static/doctools.js"></script>
-    <link rel="top" title="ImageMetaTag 0.6.11 documentation" href="../../index.html" />
+    <link rel="top" title="ImageMetaTag 0.6.12 documentation" href="../../index.html" />
     <link rel="up" title="ImageMetaTag" href="../ImageMetaTag.html" /> 
   </head>
   <body>
@@ -36,7 +36,7 @@ <h3>Navigation</h3>
         <li class="right" >
           <a href="../../py-modindex.html" title="Python Module Index"
              >modules</a> |</li>
-        <li><a href="../../index.html">ImageMetaTag 0.6.11 documentation</a> &raquo;</li>
+        <li><a href="../../index.html">ImageMetaTag 0.6.12 documentation</a> &raquo;</li>
           <li><a href="../index.html" >Module code</a> &raquo;</li>
           <li><a href="../ImageMetaTag.html" accesskey="U">ImageMetaTag</a> &raquo;</li> 
       </ul>
@@ -885,7 +885,7 @@ <h3>Navigation</h3>
         <li class="right" >
           <a href="../../py-modindex.html" title="Python Module Index"
              >modules</a> |</li>
-        <li><a href="../../index.html">ImageMetaTag 0.6.11 documentation</a> &raquo;</li>
+        <li><a href="../../index.html">ImageMetaTag 0.6.12 documentation</a> &raquo;</li>
           <li><a href="../index.html" >Module code</a> &raquo;</li>
           <li><a href="../ImageMetaTag.html" >ImageMetaTag</a> &raquo;</li> 
       </ul>

diff --git a/docs/build/html/_modules/ImageMetaTag/webpage.html b/docs/build/html/_modules/ImageMetaTag/webpage.html
@@ -6,15 +6,15 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 
-    <title>ImageMetaTag.webpage &mdash; ImageMetaTag 0.6.11 documentation</title>
+    <title>ImageMetaTag.webpage &mdash; ImageMetaTag 0.6.12 documentation</title>
 
     <link rel="stylesheet" href="../../_static/sphinxdoc.css" type="text/css" />
     <link rel="stylesheet" href="../../_static/pygments.css" type="text/css" />
 
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../../',
-        VERSION:     '0.6.11',
+        VERSION:     '0.6.12',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -23,7 +23,7 @@
     <script type="text/javascript" src="../../_static/jquery.js"></script>
     <script type="text/javascript" src="../../_static/underscore.js"></script>
     <script type="text/javascript" src="../../_static/doctools.js"></script>
-    <link rel="top" title="ImageMetaTag 0.6.11 documentation" href="../../index.html" />
+    <link rel="top" title="ImageMetaTag 0.6.12 documentation" href="../../index.html" />
     <link rel="up" title="ImageMetaTag" href="../ImageMetaTag.html" /> 
   </head>
   <body>
@@ -36,7 +36,7 @@ <h3>Navigation</h3>
         <li class="right" >
           <a href="../../py-modindex.html" title="Python Module Index"
              >modules</a> |</li>
-        <li><a href="../../index.html">ImageMetaTag 0.6.11 documentation</a> &raquo;</li>
+        <li><a href="../../index.html">ImageMetaTag 0.6.12 documentation</a> &raquo;</li>
           <li><a href="../index.html" >Module code</a> &raquo;</li>
           <li><a href="../ImageMetaTag.html" accesskey="U">ImageMetaTag</a> &raquo;</li> 
       </ul>
@@ -1027,7 +1027,7 @@ <h3>Navigation</h3>
         <li class="right" >
           <a href="../../py-modindex.html" title="Python Module Index"
              >modules</a> |</li>
-        <li><a href="../../index.html">ImageMetaTag 0.6.11 documentation</a> &raquo;</li>
+        <li><a href="../../index.html">ImageMetaTag 0.6.12 documentation</a> &raquo;</li>
           <li><a href="../index.html" >Module code</a> &raquo;</li>
           <li><a href="../ImageMetaTag.html" >ImageMetaTag</a> &raquo;</li> 
       </ul>

diff --git a/docs/build/html/_modules/index.html b/docs/build/html/_modules/index.html
@@ -6,15 +6,15 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 
-    <title>Overview: module code &mdash; ImageMetaTag 0.6.11 documentation</title>
+    <title>Overview: module code &mdash; ImageMetaTag 0.6.12 documentation</title>
 
     <link rel="stylesheet" href="../_static/sphinxdoc.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
 
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '0.6.11',
+        VERSION:     '0.6.12',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -23,7 +23,7 @@
     <script type="text/javascript" src="../_static/jquery.js"></script>
     <script type="text/javascript" src="../_static/underscore.js"></script>
     <script type="text/javascript" src="../_static/doctools.js"></script>
-    <link rel="top" title="ImageMetaTag 0.6.11 documentation" href="../index.html" /> 
+    <link rel="top" title="ImageMetaTag 0.6.12 documentation" href="../index.html" /> 
   </head>
   <body>
     <div class="related">
@@ -35,7 +35,7 @@ <h3>Navigation</h3>
         <li class="right" >
           <a href="../py-modindex.html" title="Python Module Index"
              >modules</a> |</li>
-        <li><a href="../index.html">ImageMetaTag 0.6.11 documentation</a> &raquo;</li> 
+        <li><a href="../index.html">ImageMetaTag 0.6.12 documentation</a> &raquo;</li> 
       </ul>
     </div>
       <div class="sphinxsidebar">
@@ -84,7 +84,7 @@ <h3>Navigation</h3>
         <li class="right" >
           <a href="../py-modindex.html" title="Python Module Index"
              >modules</a> |</li>
-        <li><a href="../index.html">ImageMetaTag 0.6.11 documentation</a> &raquo;</li> 
+        <li><a href="../index.html">ImageMetaTag 0.6.12 documentation</a> &raquo;</li> 
       </ul>
     </div>
     <div class="footer">

diff --git a/docs/build/html/db.html b/docs/build/html/db.html
@@ -6,15 +6,15 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 
-    <title>ImageMetaTag.db &mdash; ImageMetaTag 0.6.11 documentation</title>
+    <title>ImageMetaTag.db &mdash; ImageMetaTag 0.6.12 documentation</title>
 
     <link rel="stylesheet" href="_static/sphinxdoc.css" type="text/css" />
     <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
 
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    './',
-        VERSION:     '0.6.11',
+        VERSION:     '0.6.12',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -23,7 +23,7 @@
     <script type="text/javascript" src="_static/jquery.js"></script>
     <script type="text/javascript" src="_static/underscore.js"></script>
     <script type="text/javascript" src="_static/doctools.js"></script>
-    <link rel="top" title="ImageMetaTag 0.6.11 documentation" href="index.html" />
+    <link rel="top" title="ImageMetaTag 0.6.12 documentation" href="index.html" />
     <link rel="next" title="ImageMetaTag.ImageDict" href="ImageDict.html" />
     <link rel="prev" title="ImageMetaTag.savefig" href="savefig.html" /> 
   </head>
@@ -43,7 +43,7 @@ <h3>Navigation</h3>
         <li class="right" >
           <a href="savefig.html" title="ImageMetaTag.savefig"
              accesskey="P">previous</a> |</li>
-        <li><a href="index.html">ImageMetaTag 0.6.11 documentation</a> &raquo;</li> 
+        <li><a href="index.html">ImageMetaTag 0.6.12 documentation</a> &raquo;</li> 
       </ul>
     </div>
       <div class="sphinxsidebar">
@@ -359,7 +359,7 @@ <h3>Navigation</h3>
         <li class="right" >
           <a href="savefig.html" title="ImageMetaTag.savefig"
              >previous</a> |</li>
-        <li><a href="index.html">ImageMetaTag 0.6.11 documentation</a> &raquo;</li> 
+        <li><a href="index.html">ImageMetaTag 0.6.12 documentation</a> &raquo;</li> 
       </ul>
     </div>
     <div class="footer">

diff --git a/docs/build/html/genindex.html b/docs/build/html/genindex.html
@@ -7,15 +7,15 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 
-    <title>Index &mdash; ImageMetaTag 0.6.11 documentation</title>
+    <title>Index &mdash; ImageMetaTag 0.6.12 documentation</title>
 
     <link rel="stylesheet" href="_static/sphinxdoc.css" type="text/css" />
     <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
 
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    './',
-        VERSION:     '0.6.11',
+        VERSION:     '0.6.12',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -24,7 +24,7 @@
     <script type="text/javascript" src="_static/jquery.js"></script>
     <script type="text/javascript" src="_static/underscore.js"></script>
     <script type="text/javascript" src="_static/doctools.js"></script>
-    <link rel="top" title="ImageMetaTag 0.6.11 documentation" href="index.html" /> 
+    <link rel="top" title="ImageMetaTag 0.6.12 documentation" href="index.html" /> 
   </head>
   <body>
     <div class="related">
@@ -36,7 +36,7 @@ <h3>Navigation</h3>
         <li class="right" >
           <a href="py-modindex.html" title="Python Module Index"
              >modules</a> |</li>
-        <li><a href="index.html">ImageMetaTag 0.6.11 documentation</a> &raquo;</li> 
+        <li><a href="index.html">ImageMetaTag 0.6.12 documentation</a> &raquo;</li> 
       </ul>
     </div>
       <div class="sphinxsidebar">
@@ -403,7 +403,7 @@ <h3>Navigation</h3>
         <li class="right" >
           <a href="py-modindex.html" title="Python Module Index"
              >modules</a> |</li>
-        <li><a href="index.html">ImageMetaTag 0.6.11 documentation</a> &raquo;</li> 
+        <li><a href="index.html">ImageMetaTag 0.6.12 documentation</a> &raquo;</li> 
       </ul>
     </div>
     <div class="footer">