Download all as ZIP, adjust layout on resize

Marlin/configurator/js/FileSaver.min.js

@@ -0,0 +1,2 @@
+/*! @source http://purl.eligrey.com/github/FileSaver.js/blob/master/FileSaver.js */
+var saveAs=saveAs||typeof navigator!=="undefined"&&navigator.msSaveOrOpenBlob&&navigator.msSaveOrOpenBlob.bind(navigator)||function(view){"use strict";if(typeof navigator!=="undefined"&&/MSIE [1-9]\./.test(navigator.userAgent)){return}var doc=view.document,get_URL=function(){return view.URL||view.webkitURL||view},save_link=doc.createElementNS("http://www.w3.org/1999/xhtml","a"),can_use_save_link="download"in save_link,click=function(node){var event=doc.createEvent("MouseEvents");event.initMouseEvent("click",true,false,view,0,0,0,0,0,false,false,false,false,0,null);node.dispatchEvent(event)},webkit_req_fs=view.webkitRequestFileSystem,req_fs=view.requestFileSystem||webkit_req_fs||view.mozRequestFileSystem,throw_outside=function(ex){(view.setImmediate||view.setTimeout)(function(){throw ex},0)},force_saveable_type="application/octet-stream",fs_min_size=0,arbitrary_revoke_timeout=500,revoke=function(file){var revoker=function(){if(typeof file==="string"){get_URL().revokeObjectURL(file)}else{file.remove()}};if(view.chrome){revoker()}else{setTimeout(revoker,arbitrary_revoke_timeout)}},dispatch=function(filesaver,event_types,event){event_types=[].concat(event_types);var i=event_types.length;while(i--){var listener=filesaver["on"+event_types[i]];if(typeof listener==="function"){try{listener.call(filesaver,event||filesaver)}catch(ex){throw_outside(ex)}}}},FileSaver=function(blob,name){var filesaver=this,type=blob.type,blob_changed=false,object_url,target_view,dispatch_all=function(){dispatch(filesaver,"writestart progress write writeend".split(" "))},fs_error=function(){if(blob_changed||!object_url){object_url=get_URL().createObjectURL(blob)}if(target_view){target_view.location.href=object_url}else{var new_tab=view.open(object_url,"_blank");if(new_tab==undefined&&typeof safari!=="undefined"){view.location.href=object_url}}filesaver.readyState=filesaver.DONE;dispatch_all();revoke(object_url)},abortable=function(func){return function(){if(filesaver.readyState!==filesaver.DONE){return func.apply(this,arguments)}}},create_if_not_found={create:true,exclusive:false},slice;filesaver.readyState=filesaver.INIT;if(!name){name="download"}if(can_use_save_link){object_url=get_URL().createObjectURL(blob);save_link.href=object_url;save_link.download=name;click(save_link);filesaver.readyState=filesaver.DONE;dispatch_all();revoke(object_url);return}if(view.chrome&&type&&type!==force_saveable_type){slice=blob.slice||blob.webkitSlice;blob=slice.call(blob,0,blob.size,force_saveable_type);blob_changed=true}if(webkit_req_fs&&name!=="download"){name+=".download"}if(type===force_saveable_type||webkit_req_fs){target_view=view}if(!req_fs){fs_error();return}fs_min_size+=blob.size;req_fs(view.TEMPORARY,fs_min_size,abortable(function(fs){fs.root.getDirectory("saved",create_if_not_found,abortable(function(dir){var save=function(){dir.getFile(name,create_if_not_found,abortable(function(file){file.createWriter(abortable(function(writer){writer.onwriteend=function(event){target_view.location.href=file.toURL();filesaver.readyState=filesaver.DONE;dispatch(filesaver,"writeend",event);revoke(file)};writer.onerror=function(){var error=writer.error;if(error.code!==error.ABORT_ERR){fs_error()}};"writestart progress write abort".split(" ").forEach(function(event){writer["on"+event]=filesaver["on"+event]});writer.write(blob);filesaver.abort=function(){writer.abort();filesaver.readyState=filesaver.DONE};filesaver.readyState=filesaver.WRITING}),fs_error)}),fs_error)};dir.getFile(name,{create:false},abortable(function(file){file.remove();save()}),abortable(function(ex){if(ex.code===ex.NOT_FOUND_ERR){save()}else{fs_error()}}))}),fs_error)}),fs_error)},FS_proto=FileSaver.prototype,saveAs=function(blob,name){return new FileSaver(blob,name)};FS_proto.abort=function(){var filesaver=this;filesaver.readyState=filesaver.DONE;dispatch(filesaver,"abort")};FS_proto.readyState=FS_proto.INIT=0;FS_proto.WRITING=1;FS_proto.DONE=2;FS_proto.error=FS_proto.onwritestart=FS_proto.onprogress=FS_proto.onwrite=FS_proto.onabort=FS_proto.onerror=FS_proto.onwriteend=null;return saveAs}(typeof self!=="undefined"&&self||typeof window!=="undefined"&&window||this.content);if(typeof module!=="undefined"&&module.exports){module.exports.saveAs=saveAs}else if(typeof define!=="undefined"&&define!==null&&define.amd!=null){define([],function(){return saveAs})}

Marlin/configurator/js/configurator.js

@@ -140,8 +140,8 @@ var configuratorApp = (function(){
       $msgbox = $('#message'),
       $form = $('#config_form'),
       $tooltip = $('#tooltip'),
-      $config = $('#config_text pre'),
-      $config_adv = $('#config_adv_text pre'),
+      $cfg = $('#config_text'), $adv = $('#config_adv_text'),
+      $config = $cfg.find('pre'), $config_adv = $adv.find('pre'),
       define_list = [[],[]],
       define_section = {},
       boards_list = {},
@@ -186,11 +186,8 @@ var configuratorApp = (function(){
           : $pre.slideUp(200, didAnim);
       });
 
-      // Fix the config boxes on the screen (in wide style)
-      $(window).bind('scroll resize', function(){
-        var $cfg = $('#config_text'), wtop = $(window).scrollTop(), ctop = $cfg.offset().top;
-        $cfg.css({ paddingTop: ctop < $form.offset().top+100 && wtop > ctop ? wtop-ctop : 0 });
-      });
+      // Adjust the form layout for the window size
+      $(window).bind('scroll resize', this.adjustFormLayout).trigger('resize');
 
       // Read boards.h, Configuration.h, Configuration_adv.h
       var ajax_count = 0, success_count = 0;
@@ -286,6 +283,28 @@ var configuratorApp = (function(){
         .css({visibility:'visible'});
     },
 
+    /**
+     * Make the download-all link visible and active
+     */
+    activateDownloadAllLink: function() {
+      $('.download-all')
+        .unbind('mouseover click')
+        .mouseover(function() {
+          var d = new Date(), fn = d.fileStamp('MarlinConfig.zip');
+          $(this).attr({ download:fn, href:'download:'+fn, title:'download:'+fn });
+        })
+        .click(function(){
+          var $button = $(this);
+          var zip = new JSZip();
+          zip.file(config_file, $config.text());
+          zip.file(config_adv_file, $config_adv.text());
+          var zipped = zip.generate({type:'blob'});
+          saveAs(zipped, $button.attr('download'));
+          return false;
+        })
+        .css({visibility:'visible'});
+    },
+
     /**
      * Init the boards array from a boards.h file
      */
@@ -316,8 +335,8 @@ var configuratorApp = (function(){
      * Get all the unique define names
      */
     updateDefinesFromText: function(index, txt) {
-      var section = 'machine',
-          leave_out_defines = ['CONFIGURATION_H', 'CONFIGURATION_ADV_H', 'STRING_VERSION', 'STRING_URL', 'STRING_VERSION_CONFIG_H', 'STRING_CONFIG_H_AUTHOR', 'STRING_SPLASH_LINE1', 'STRING_SPLASH_LINE2'],
+      var section = 'hidden',
+          leave_out_defines = ['CONFIGURATION_H', 'CONFIGURATION_ADV_H'],
           define_sect = {},
           r, findDef = new RegExp('(@section|#define)[ \\t]+(\\w+)', 'gm');
       while((r = findDef.exec(txt)) !== null) {
@@ -426,6 +445,8 @@ var configuratorApp = (function(){
             // this.initThermistorsFromText(txt);
             init_index = 0;
             has_config = true;
+            if (has_config_adv)
+              this.activateDownloadAllLink();
           }
           else {
             err = boards_file;
@@ -437,6 +458,8 @@ var configuratorApp = (function(){
             total_config_adv_lines = txt.lineCount();
             init_index = 1;
             has_config_adv = true;
+            if (has_config)
+              this.activateDownloadAllLink();
           }
           else {
             err = config_file;
@@ -448,8 +471,14 @@ var configuratorApp = (function(){
         var adv = init_index == 1;
         this.purgeAddedFields(init_index);
         this.updateDefinesFromText(init_index, txt);
+        // TODO: Find sequential names and group them
+        //       Allows related settings to occupy one line in the form
+          // this.refreshSequentialDefines();
+        // TODO: Get dependent groups (#ifdef's) from text
+        //       Allows parent to hide/show or disable/enable dependent fields!
+          // this.refreshDependentGroups(); // (from all config text)
         this.createFieldsForDefines(adv);
-        this.refreshConfigForm(init_index);
+        this.refreshConfigForm(init_index); // TODO: <-- hide dependent fields
         this.activateDownloadLink(adv);
       }
       this.setMessage(err
@@ -1019,7 +1048,11 @@ var configuratorApp = (function(){
               clearInterval(err.pulser);
             }
           }, 50);
-        $err.click(function(e) { $(this).remove(); return false; }).css({cursor:'pointer'});
+        $err.click(function(e) {
+          $(this).remove();
+          self.adjustFormLayout();
+          return false;
+        }).css({cursor:'pointer'});
       }
       else {
         $msgbox.find('p.error, p.warning').each(function() {
@@ -1028,6 +1061,27 @@ var configuratorApp = (function(){
           $(this).remove();
         });
       }
+      self.adjustFormLayout();
+    },
+
+    adjustFormLayout: function() {
+      var wtop = $(window).scrollTop(),
+          ctop = $cfg.offset().top,
+          thresh = $form.offset().top+100;
+      if (ctop < thresh) {
+        var maxhi = $form.height(); // pad plus heights of config boxes can't be more than this
+        var pad = wtop > ctop ? wtop-ctop : 0; // pad the top box to stay in view
+        var innerpad = Math.ceil($cfg.height() - $cfg.find('pre').height());
+        // height to use for the inner boxes
+        var hi = ($(window).height() - ($cfg.offset().top - pad) + wtop - innerpad)/2;
+        if (hi < 200) hi = 200;
+        $cfg.css({ paddingTop: pad });
+        var $pre = $('pre.config');
+        $pre.css({ height: Math.floor(hi) - $pre.position().top });
+      }
+      else {
+        $cfg.css({ paddingTop: wtop > ctop ? wtop-ctop : 0, height: '' });
+      }
     },
 
     setRequestError: function(stat, path) {