fae-rails 2.1.0 → 3.0.0

data/app/assets/javascripts/fae/form/inputs/_text.js

@@ -6,7 +6,7 @@
  * @memberof form
  */
 Fae.form.text = {
-  init: function() {
+  init: function () {
     this.overrideMarkdownDefaults();
     this.initMarkdown();
     this.initHTML();
@@ -16,7 +16,7 @@ Fae.form.text = {
    * Override SimpleMDE's preference for font-awesome icons and use a modal for the guide
    * @see {@link modals.markdownModal}
    */
-  overrideMarkdownDefaults: function() {
+  overrideMarkdownDefaults: function () {
     toolbarBuiltInButtons['bold'].className = 'icon-bold';
     toolbarBuiltInButtons['italic'].className = 'icon-italic';
     toolbarBuiltInButtons['heading'].className = 'icon-font';
@@ -40,8 +40,20 @@ Fae.form.text = {
    * Find all markdown fields and initialize them with a markdown GUI
    * @has_test {features/form_helpers/fae_input_spec.rb}
    */
-  initMarkdown: function() {
-    $('.js-markdown-editor:not(.mde-enabled)').each(function() {
+  initMarkdown: function () {
+    var inlineAttachmentConfig = {
+      uploadUrl: '/admin/html_embedded_image',
+      uploadFieldName: 'image',
+      jsonFieldName: 'file',
+      progressText: '![Uploading file...]()',
+      urlText: '![file]({filename})',
+      errorText: 'Error uploading file, file may be too large',
+      extraHeaders: {
+        'X-CSRF-Token': $.rails.csrfToken()
+      }
+    }
+
+    $('.js-markdown-editor:not(.mde-enabled)').each(function () {
       var $this = $(this);
 
       var editor = new SimpleMDE({
@@ -49,9 +61,11 @@ Fae.form.text = {
         autoDownloadFontAwesome: false,
         status: false,
         spellChecker: false,
-        hideIcons: ['image', 'side-by-side', 'fullscreen', 'preview']
+        hideIcons: ['image', 'side-by-side', 'fullscreen']
       });
 
+      inlineAttachment.editors.codemirror4.attach(editor.codemirror, inlineAttachmentConfig);
+
       // Disable tabbing within editor
       editor.codemirror.options.extraKeys['Tab'] = false;
       editor.codemirror.options.extraKeys['Shift-Tab'] = false;
@@ -59,16 +73,16 @@ Fae.form.text = {
       $this.addClass('mde-enabled');
 
       // code mirror events to hook into current form element functions
-      editor.codemirror.on('change', function(){
+      editor.codemirror.on('change', function (){
         // updates the original textarea's value for JS validations
         $this.val(editor.value());
         // update length counter
         Fae.form.validator.length_counter.updateCounter($this);
       });
-      editor.codemirror.on('focus', function(){
+      editor.codemirror.on('focus', function (){
         $this.parent().addClass('mde-focus');
       });
-      editor.codemirror.on('blur', function(){
+      editor.codemirror.on('blur', function (){
         // trigger blur on the original textarea to trigger JS validations
         $this.blur();
         $this.parent().removeClass('mde-focus');
@@ -80,7 +94,7 @@ Fae.form.text = {
    * Find all HTML fields and initialize them with a wysiwyg GUI
    * @has_test {features/form_helpers/fae_input_spec.rb}
    */
-  initHTML: function() {
+  initHTML: function () {
     var $html_editors = $('.js-html-editor');
     if(!$html_editors.length) {
       return;

data/app/assets/javascripts/fae/vendor/simplemde/codemirror-4.inline-attachment.js

@@ -0,0 +1,95 @@
+// https://github.com/Rovak/InlineAttachment/blob/master/src/codemirror-4.inline-attachment.js
+
+/*jslint newcap: true */
+/*global inlineAttachment: false */
+/**
+ * CodeMirror version for inlineAttachment
+ *
+ * Call inlineAttachment.attach(editor) to attach to a codemirror instance
+ */
+(function () {
+  'use strict';
+
+  var codeMirrorEditor = function (instance) {
+    if (!instance.getWrapperElement) {
+      throw 'Invalid CodeMirror object given';
+    }
+
+    this.codeMirror = instance;
+  };
+
+  codeMirrorEditor.prototype.getValue = function () {
+    return this.codeMirror.getValue();
+  };
+
+  codeMirrorEditor.prototype.insertValue = function (val) {
+    this.codeMirror.replaceSelection(val);
+  };
+
+  codeMirrorEditor.prototype.setValue = function (val) {
+    var cursor = this.codeMirror.getCursor();
+    this.codeMirror.setValue(val);
+    this.codeMirror.setCursor(cursor);
+  };
+
+  /**
+   * Attach InlineAttachment to CodeMirror
+   *
+   * @param {CodeMirror} codeMirror
+   */
+  codeMirrorEditor.attach = function (codeMirror, options) {
+    options = options || {};
+
+    var editor = new codeMirrorEditor(codeMirror),
+      inlineattach = new inlineAttachment(options, editor),
+      el = codeMirror.getWrapperElement();
+
+    el.addEventListener(
+      'paste',
+      function (e) {
+        inlineattach.onPaste(e);
+      },
+      false
+    );
+
+    codeMirror.setOption('onDragEvent', function (data, e) {
+      if (e.type === 'drop') {
+        e.stopPropagation();
+        e.preventDefault();
+        return inlineattach.onDrop(e);
+      }
+    });
+  };
+
+  var codeMirrorEditor4 = function (instance) {
+    codeMirrorEditor.call(this, instance);
+  };
+
+  codeMirrorEditor4.attach = function (codeMirror, options) {
+    options = options || {};
+
+    var editor = new codeMirrorEditor(codeMirror),
+      inlineattach = new inlineAttachment(options, editor),
+      el = codeMirror.getWrapperElement();
+
+    el.addEventListener(
+      'paste',
+      function (e) {
+        inlineattach.onPaste(e);
+      },
+      false
+    );
+
+    codeMirror.on('drop', function (data, e) {
+      if (inlineattach.onDrop(e)) {
+        e.stopPropagation();
+        e.preventDefault();
+        return true;
+      } else {
+        return false;
+      }
+    });
+  };
+
+  inlineAttachment.editors.codemirror4 = codeMirrorEditor4;
+})();

data/app/assets/javascripts/fae/vendor/simplemde/inline-attachment.js

@@ -0,0 +1,405 @@
+/*jslint newcap: true */
+/*global XMLHttpRequest: false, FormData: false */
+/*
+ * https://raw.githubusercontent.com/Rovak/InlineAttachment/master/src/inline-attachment.js
+ * Inline Text Attachment
+ *
+ * Author: Roy van Kaathoven
+ * Contact: ik@royvankaathoven.nl
+ */
+(function (document, window) {
+  'use strict';
+
+  var inlineAttachment = function (options, instance) {
+    this.settings = inlineAttachment.util.merge(
+      options,
+      inlineAttachment.defaults
+    );
+    this.editor = instance;
+    this.filenameTag = '{filename}';
+    this.lastValue = null;
+  };
+
+  /**
+   * Will holds the available editors
+   *
+   * @type {Object}
+   */
+  inlineAttachment.editors = {};
+
+  /**
+   * Utility functions
+   */
+  inlineAttachment.util = {
+    /**
+     * Simple function to merge the given objects
+     *
+     * @param {Object[]} object Multiple object parameters
+     * @returns {Object}
+     */
+    merge: function () {
+      var result = {};
+      for (var i = arguments.length - 1; i >= 0; i--) {
+        var obj = arguments[i];
+        for (var k in obj) {
+          if (obj.hasOwnProperty(k)) {
+            result[k] = obj[k];
+          }
+        }
+      }
+      return result;
+    },
+
+    /**
+     * Append a line of text at the bottom, ensuring there aren't unnecessary newlines
+     *
+     * @param {String} appended Current content
+     * @param {String} previous Value which should be appended after the current content
+     */
+    appendInItsOwnLine: function (previous, appended) {
+      return (previous + "\n\n[[D]]" + appended)
+        .replace(/(\n{2,})\[\[D\]\]/, "\n\n")
+        .replace(/^(\n*)/, "");
+    },
+
+    /**
+     * Inserts the given value at the current cursor position of the textarea element
+     *
+     * @param  {HtmlElement} el
+     * @param  {String} value Text which will be inserted at the cursor position
+     */
+    insertTextAtCursor: function (el, text) {
+      var scrollPos = el.scrollTop,
+        strPos = 0,
+        browser = false,
+        range;
+
+      if (el.selectionStart || el.selectionStart === '0') {
+        browser = 'ff';
+      } else if (document.selection) {
+        browser = 'ie';
+      }
+
+      if (browser === 'ie') {
+        el.focus();
+        range = document.selection.createRange();
+        range.moveStart('character', -el.value.length);
+        strPos = range.text.length;
+      } else if (browser === 'ff') {
+        strPos = el.selectionStart;
+      }
+
+      var front = el.value.substring(0, strPos);
+      var back = el.value.substring(strPos, el.value.length);
+      el.value = front + text + back;
+      strPos = strPos + text.length;
+      if (browser === 'ie') {
+        el.focus();
+        range = document.selection.createRange();
+        range.moveStart('character', -el.value.length);
+        range.moveStart('character', strPos);
+        range.moveEnd('character', 0);
+        range.select();
+      } else if (browser === 'ff') {
+        el.selectionStart = strPos;
+        el.selectionEnd = strPos;
+        el.focus();
+      }
+      el.scrollTop = scrollPos;
+    }
+  };
+
+  /**
+   * Default configuration options
+   *
+   * @type {Object}
+   */
+  inlineAttachment.defaults = {
+    /**
+     * URL where the file will be send
+     */
+    uploadUrl: 'upload_attachment.php',
+
+    /**
+     * Which method will be used to send the file to the upload URL
+     */
+    uploadMethod: 'POST',
+
+    /**
+     * Name in which the file will be placed
+     */
+    uploadFieldName: 'image',
+
+    /**
+     * Extension which will be used when a file extension could not
+     * be detected
+     */
+    defaultExtension: 'png',
+
+    /**
+     * JSON field which refers to the uploaded file URL
+     */
+    jsonFieldName: 'filename',
+
+    /**
+     * Allowed MIME types
+     */
+    allowedTypes: [
+      'image/jpeg',
+      'image/png',
+      'image/jpg',
+      'image/gif'
+    ],
+
+    /**
+     * Text which will be inserted when dropping or pasting a file.
+     * Acts as a placeholder which will be replaced when the file is done with uploading
+     */
+    progressText: '![Uploading file...]()',
+
+    /**
+     * When a file has successfully been uploaded the progressText
+     * will be replaced by the urlText, the {filename} tag will be replaced
+     * by the filename that has been returned by the server
+     */
+    urlText: '![file]({filename})',
+
+    /**
+     * Text which will be used when uploading has failed
+     */
+    errorText: 'Error uploading file',
+
+    /**
+     * Extra parameters which will be send when uploading a file
+     */
+    extraParams: {},
+
+    /**
+     * Extra headers which will be send when uploading a file
+     */
+    extraHeaders: {},
+
+    /**
+     * Before the file is send
+     */
+    beforeFileUpload: function () {
+      return true;
+    },
+
+    /**
+     * Triggers when a file is dropped or pasted
+     */
+    onFileReceived: function () {},
+
+    /**
+     * Custom upload handler
+     *
+     * @return {Boolean} when false is returned it will prevent default upload behavior
+     */
+    onFileUploadResponse: function () {
+      return true;
+    },
+
+    /**
+     * Custom error handler. Runs after removing the placeholder text and before the alert().
+     * Return false from this function to prevent the alert dialog.
+     *
+     * @return {Boolean} when false is returned it will prevent default error behavior
+     */
+    onFileUploadError: function () {
+      return true;
+    },
+
+    /**
+     * When a file has succesfully been uploaded
+     */
+    onFileUploaded: function () {}
+  };
+
+  /**
+   * Uploads the blob
+   *
+   * @param  {Blob} file blob data received from event.dataTransfer object
+   * @return {XMLHttpRequest} request object which sends the file
+   */
+  inlineAttachment.prototype.uploadFile = function (file) {
+    var me = this,
+      formData = new FormData(),
+      xhr = new XMLHttpRequest(),
+      settings = this.settings,
+      extension = settings.defaultExtension || settings.defualtExtension;
+
+    if (typeof settings.setupFormData === 'function') {
+      settings.setupFormData(formData, file);
+    }
+
+    // Attach the file. If coming from clipboard, add a default filename (only works in Chrome for now)
+    // http://stackoverflow.com/questions/6664967/how-to-give-a-blob-uploaded-as-formdata-a-file-name
+    if (file.name) {
+      var fileNameMatches = file.name.match(/\.(.+)$/);
+      if (fileNameMatches) {
+        extension = fileNameMatches[1];
+      }
+    }
+
+    var remoteFilename = 'image-' + Date.now() + '.' + extension;
+    if (typeof settings.remoteFilename === 'function') {
+      remoteFilename = settings.remoteFilename(file);
+    }
+
+    formData.append(settings.uploadFieldName, file, remoteFilename);
+
+    // Append the extra parameters to the formdata
+    if (typeof settings.extraParams === 'object') {
+      for (var key in settings.extraParams) {
+        if (settings.extraParams.hasOwnProperty(key)) {
+          formData.append(key, settings.extraParams[key]);
+        }
+      }
+    }
+
+    xhr.open('POST', settings.uploadUrl);
+
+    // Add any available extra headers
+    if (typeof settings.extraHeaders === 'object') {
+      for (var header in settings.extraHeaders) {
+        if (settings.extraHeaders.hasOwnProperty(header)) {
+          xhr.setRequestHeader(header, settings.extraHeaders[header]);
+        }
+      }
+    }
+
+    xhr.onload = function () {
+      // If HTTP status is OK or Created
+      if (xhr.status === 200 || xhr.status === 201) {
+        me.onFileUploadResponse(xhr);
+      } else {
+        me.onFileUploadError(xhr);
+      }
+    };
+    if (settings.beforeFileUpload(xhr) !== false) {
+      xhr.send(formData);
+    }
+    return xhr;
+  };
+
+  /**
+   * Returns if the given file is allowed to handle
+   *
+   * @param {File} clipboard data file
+   */
+  inlineAttachment.prototype.isFileAllowed = function (file) {
+    if (file.kind === 'string') {
+      return false;
+    }
+    if (this.settings.allowedTypes.indexOf('*') === 0) {
+      return true;
+    } else {
+      return this.settings.allowedTypes.indexOf(file.type) >= 0;
+    }
+  };
+
+  /**
+   * Handles upload response
+   *
+   * @param  {XMLHttpRequest} xhr
+   * @return {Void}
+   */
+  inlineAttachment.prototype.onFileUploadResponse = function (xhr) {
+    if (this.settings.onFileUploadResponse.call(this, xhr) !== false) {
+      var result = JSON.parse(xhr.responseText),
+        filename = result[this.settings.jsonFieldName];
+
+      if (result && filename) {
+        var newValue;
+        if (typeof this.settings.urlText === 'function') {
+          newValue = this.settings.urlText.call(this, filename, result);
+        } else {
+          newValue = this.settings.urlText.replace(this.filenameTag, filename);
+        }
+        var text = this.editor.getValue().replace(this.lastValue, newValue);
+        this.editor.setValue(text);
+        this.settings.onFileUploaded.call(this, filename);
+      }
+    }
+  };
+
+  /**
+   * Called when a file has failed to upload
+   *
+   * @param  {XMLHttpRequest} xhr
+   * @return {Void}
+   */
+  inlineAttachment.prototype.onFileUploadError = function (xhr) {
+    if (this.settings.onFileUploadError.call(this, xhr) !== false) {
+      var text = this.editor
+        .getValue()
+        .replace(this.lastValue, this.settings.errorText);
+      this.editor.setValue(text);
+    }
+  };
+
+  /**
+   * Called when a file has been inserted, either by drop or paste
+   *
+   * @param  {File} file
+   * @return {Void}
+   */
+  inlineAttachment.prototype.onFileInserted = function (file) {
+    if (this.settings.onFileReceived.call(this, file) !== false) {
+      this.lastValue = this.settings.progressText;
+      this.editor.insertValue(this.lastValue);
+    }
+  };
+
+  /**
+   * Called when a paste event occured
+   * @param  {Event} e
+   * @return {Boolean} if the event was handled
+   */
+  inlineAttachment.prototype.onPaste = function (e) {
+    var result = false,
+      clipboardData = e.clipboardData,
+      items;
+
+    if (typeof clipboardData === 'object') {
+      items = clipboardData.items || clipboardData.files || [];
+
+      for (var i = 0; i < items.length; i++) {
+        var item = items[i];
+        if (this.isFileAllowed(item)) {
+          result = true;
+          this.onFileInserted(item.getAsFile());
+          this.uploadFile(item.getAsFile());
+        }
+      }
+    }
+
+    if (result) {
+      e.preventDefault();
+    }
+
+    return result;
+  };
+
+  /**
+   * Called when a drop event occures
+   * @param  {Event} e
+   * @return {Boolean} if the event was handled
+   */
+  inlineAttachment.prototype.onDrop = function (e) {
+    var result = false;
+    for (var i = 0; i < e.dataTransfer.files.length; i++) {
+      var file = e.dataTransfer.files[i];
+      if (this.isFileAllowed(file)) {
+        result = true;
+        this.onFileInserted(file);
+        this.uploadFile(file);
+      }
+    }
+
+    return result;
+  };
+
+  window.inlineAttachment = inlineAttachment;
+})(document, window);

data/app/assets/stylesheets/fae/application.css

@@ -5,4 +5,5 @@
  *= require fae/vendor/simplemde.min
  *= require fae/vendor/trumbowyg
  *= require fae/base
+ *= require fae/simplemde_override
  */

data/app/assets/stylesheets/fae/base.scss

@@ -32,7 +32,8 @@
   'globals/navigation/sidenav',
   'globals/navigation/mobilenav',
   'globals/navigation/utility',
-  'globals/navigation/search'
+  'globals/navigation/search',
+  'globals/navigation/multi-col-subnav'
 ;
 
 // Tables
@@ -52,8 +53,10 @@
 @import
   'modules/buttons',
   'modules/modal',
+  'modules/deploy',
   'modules/toggles',
-  'modules/alerts'
+  'modules/alerts',
+  'modules/errors-bar'
 ;
 
 // Forms
@@ -70,7 +73,8 @@
   'modules/forms/colorpicker',
   'modules/forms/hints',
   'modules/forms/validation',
-  'modules/forms/simple-mde'
+  'modules/forms/simple-mde',
+  'modules/forms/form-manager'
 ;
 
 // Pages

data/app/assets/stylesheets/fae/globals/_tags.scss

@@ -33,7 +33,7 @@ body {
 
 a {
   @include transition(color .2s);
-  color: $c-custom-highlight;
+  color: var(--highlight-color);
   text-decoration: none;
 
   &:hover {

data/app/assets/stylesheets/fae/globals/imports/_variables.scss

@@ -89,6 +89,7 @@ $c-chosen-gradient-end: $c-light-grey !default;
 $c-chosen-multi-bg: $c-lightest-grey !default;
 $c-chosen-multi-text: $c-dark-grey !default;
 $c-chosen-multi-delete: $c-darker-grey !default;
+$c-focus-border: $c-mid-dark-grey !default;
 
 // Yes / No Sliders
 $c-slider-no-color: $c-light-grey !default;

data/app/assets/stylesheets/fae/globals/layout/_base.scss

@@ -27,14 +27,13 @@
 
   h2 {
     padding: 17px $content-buffer;
-    color: pickForegroundColor($c-custom-highlight, $c-white, $c-black);
-    background: $c-custom-highlight;
+    color: var(--foreground-color);
+    background: var(--highlight-color);
     border-top: 1px solid $c-border;
     text-transform: uppercase;
     font-size: 14px;
     letter-spacing: .2em;
-    // counters the padding from .content
-    margin: 0 negate($content-buffer) 30px;
+    margin: 0 0 30px;
   }
 
   h3 {
@@ -46,3 +45,9 @@
     margin-bottom: 20px;
   }
 }
+
+p {
+  margin-bottom: 1.3em;
+  max-width: 80%;
+  line-height: 1.2em;
+}