resolve merge conflicts with t and staging

customize.dist/src/less2/include/help.less

@@ -8,6 +8,8 @@
 
         position: relative;
         background-color: @colortheme_help-bg;
+        max-height: 50%;
+        overflow-y: auto;
         &.cp-help-hidden {
             display: none;
         }

www/common/sframe-app-framework.js

@@ -433,21 +433,37 @@ define([
                 var ext = (typeof(extension) === 'function') ? extension() : extension;
                 var suggestion = title.suggestTitle('cryptpad-document');
                 ext = ext || '.txt';
-                var types = [{
+                var types = [];
+                if (Array.isArray(ext) && ext.length) {
+                    ext.forEach(function (_ext) {
+                        types.push({
+                            tag: 'a',
+                            attributes: {
+                                'data-value': _ext,
+                                'href': '#'
+                            },
+                            content: _ext
+                        });
+                    });
+                    ext = ext[0];
+                } else {
+                    types.push({
                         tag: 'a',
                         attributes: {
                             'data-value': ext,
                             'href': '#'
                         },
                         content: ext
-                }, {
+                    });
+                }
+                types.push({
                     tag: 'a',
                     attributes: {
                         'data-value': '',
                         'href': '#'
                     },
                     content: ' '
-                }];
+                });
                 var dropdownConfig = {
                     text: ext, // Button initial text
                     caretDown: true,
@@ -461,14 +477,15 @@ define([
                     Util.fixFileName(suggestion), function (filename)
                 {
                     if (!(typeof(filename) === 'string' && filename)) { return; }
-                    filename = filename + $select.getValue();
+                    var ext = $select.getValue();
+                    filename = filename + ext;
                     if (async) {
                         fe(function (blob) {
                             SaveAs(blob, filename);
-                        });
+                        }, ext);
                         return;
                     }
-                    var blob = fe();
+                    var blob = fe(null, ext);
                     SaveAs(blob, filename);
                 }, {
                     typeInput: $select[0]

www/common/sframe-common-codemirror.js

@@ -361,7 +361,14 @@ define([
                     common: Common
                 };
                 var $block = exp.$theme = UIElements.createDropdown(dropdownConfig);
-                $block.find('button').attr('title', Messages.themeButtonTitle);
+                $block.find('button').attr('title', Messages.themeButtonTitle).click(function () {
+                    var state = $block.find('.cp-dropdown-content').is(':visible');
+                    var $c = $block.closest('.cp-toolbar-drawer-content');
+                    $c.removeClass('cp-dropdown-visible');
+                    if (!state) {
+                        $c.addClass('cp-dropdown-visible');
+                    }
+                });
 
                 setTheme(lastTheme, $block);
 

www/pad/export.js

@@ -5,15 +5,17 @@ define([
     '/bower_components/nthen/index.js',
 ], function ($, Util, Hyperjson, nThen) {
     var module = {
-        ext: '.html'
+        ext: '.html', // default
+        exts: ['.html', '.doc']
     };
 
     var exportMediaTags = function (inner, cb) {
         var $clone = $(inner).clone();
         nThen(function (waitFor) {
             $(inner).find('media-tag').each(function (i, el) {
-                if (!$(el).data('blob') || !el.blob) { return; }
+                var blob = Util.find(el, ['_mediaObject','_blob', 'content']);
-                Util.blobToImage(el.blob || $(el).data('blob'), waitFor(function (imgSrc) {
+                if (!blob) { return; }
+                Util.blobToImage(blob, waitFor(function (imgSrc) {
                     $clone.find('media-tag[src="' + $(el).attr('src') + '"] img')
                         .attr('src', imgSrc);
                     $clone.find('media-tag').parent()
@@ -25,18 +27,31 @@ define([
         });
     };
 
+    var cleanHtml = function (inner) {
+        return inner.innerHTML.replace(/<img[^>]*class="cke_anchor"[^>]*data-cke-realelement="([^"]*)"[^>]*>/g,
+                function(match,realElt){
+                    //console.log("returning realElt \"" + unescape(realElt)+ "\".");
+                    return decodeURIComponent(realElt);
+                });
+    };
     module.getHTML = function (inner) {
         return ('<!DOCTYPE html>\n' + '<html>\n' +
                 '  <head><meta charset="utf-8"></head>\n  <body>' +
-            inner.innerHTML.replace(/<img[^>]*class="cke_anchor"[^>]*data-cke-realelement="([^"]*)"[^>]*>/g,
+                cleanHtml(inner) +
-                function(match,realElt){
-                    //console.log("returning realElt \"" + unescape(realElt)+ "\".");
-                    return decodeURIComponent(realElt); }) +
             '  </body>\n</html>'
         );
     };
 
-    module.main = function (userDoc, cb) {
+    var exportDoc = function (inner) {
+        var preHtml = "<html xmlns:o='urn:schemas-microsoft-com:office:office' xmlns:w='urn:schemas-microsoft-com:office:word' xmlns='http://www.w3.org/TR/REC-html40'><head><meta charset='utf-8'><title>Export HTML To Doc</title></head><body>";
+        var postHtml = "</body></html>";
+        var _html = preHtml+cleanHtml(inner)+postHtml;
+        return _html;
+    };
+
+    module.main = function (userDoc, cb, ext) {
+        if (!ext || module.exts.indexOf(ext) === -1) { ext = module.ext; }
+
         var inner;
         if (userDoc && userDoc.tagName) {
             inner = userDoc;
@@ -56,7 +71,14 @@ define([
             }
         }
         exportMediaTags(inner, function (toExport) {
-            cb(new Blob([ module.getHTML(toExport) ], { type: "text/html;charset=utf-8" }));
+            if (ext === ".doc") {
+                var blob = new Blob(['\ufeff', exportDoc(toExport)], {
+                    type: 'application/msword'
+                });
+                return void cb(blob);
+            }
+            var html = module.getHTML(toExport);
+            cb(new Blob([ html ], { type: "text/html;charset=utf-8" }));
         });
     };
 

www/pad/inner.js

@@ -793,8 +793,8 @@ define([
             });
         }, true);
 
-        framework.setFileExporter(Exporter.ext, function(cb) {
+        framework.setFileExporter(Exporter.exts, function(cb, ext) {
-            Exporter.main(inner, cb);
+            Exporter.main(inner, cb, ext);
         }, true);
 
         framework.setNormalizer(function(hjson) {