formagic 0.3.9 → 0.3.10

data/app/assets/stylesheets/formagic.scss

@@ -55,6 +55,14 @@ $formagic-bg-color: #fbfbfd !default;
   text-align: center;
   z-index: 10;
   cursor: pointer;
+
+  // This is used so we always have parent reorder item clicked event when
+  // user clicks on a child tag
+  &:after {
+    @include position(absolute, 0 0 0 0);
+    content: "";
+    display: block;
+  }
 }
 
 @import "formagic/form";
@@ -65,7 +73,7 @@ $formagic-bg-color: #fbfbfd !default;
 @import "formagic/group";
 @import "formagic/image";
 @import "formagic/list";
-@import "formagic/nested-form";
+@import "formagic/documents";
 @import "formagic/redactor-character";
 @import "formagic/select";
 @import "formagic/string";

data/app/assets/stylesheets/formagic/markdown.scss

@@ -4,14 +4,17 @@
     border-top: 1px solid $formagic-border-color;
     border-bottom: 1px solid $formagic-border-color;
     background-color: $white-color;
+    height: 42px;
   }
 
   button {
+    background-color: transparent;
     border: 0;
     border-radius: 0;
     color: $formagic-base-color;
+    display: inline-block;
     font-size: 0.8em;
-    line-height: 2.5;
+    height: 40px;
     padding-left: 1.25em;
     padding-right: 1.25em;
   }

data/app/assets/stylesheets/formagic/switch.scss

@@ -9,7 +9,7 @@
   $knob-width               : $knob-size;
   $switch-background        : white;
   $switch-border-background : darken($formagic-border-color, 5%);
-  $switch-shadow            : 0 0px 2px transparentize(black, 0.6);
+  $switch-shadow: 0 0px 1px transparentize(black, 0.7);
 
   border-radius : $switch-radius;
   position      : relative;

data/lib/formagic/version.rb

@@ -1,3 +1,3 @@
 module Formagic
-  VERSION = "0.3.9"
+  VERSION = "0.3.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: formagic
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.3.10
 platform: ruby
 authors:
 - Alexander Kravets
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-23 00:00:00.000000000 Z
+date: 2015-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bourbon
@@ -91,6 +91,12 @@ files:
 - app/assets/javascripts/formagic.coffee
 - app/assets/javascripts/formagic/form.coffee
 - app/assets/javascripts/formagic/group.coffee
+- app/assets/javascripts/formagic/inputs/ace-css.coffee
+- app/assets/javascripts/formagic/inputs/ace-html.coffee
+- app/assets/javascripts/formagic/inputs/ace-js.coffee
+- app/assets/javascripts/formagic/inputs/ace-markdown.coffee
+- app/assets/javascripts/formagic/inputs/ace-markdown_toolbar.coffee
+- app/assets/javascripts/formagic/inputs/ace.coffee
 - app/assets/javascripts/formagic/inputs/array.coffee
 - app/assets/javascripts/formagic/inputs/checkbox.coffee
 - app/assets/javascripts/formagic/inputs/color.coffee
@@ -102,13 +108,10 @@ files:
 - app/assets/javascripts/formagic/inputs/file.coffee
 - app/assets/javascripts/formagic/inputs/hash.coffee
 - app/assets/javascripts/formagic/inputs/hidden.coffee
-- app/assets/javascripts/formagic/inputs/html.coffee
 - app/assets/javascripts/formagic/inputs/image.coffee
 - app/assets/javascripts/formagic/inputs/list.coffee
 - app/assets/javascripts/formagic/inputs/list_reorder.coffee
 - app/assets/javascripts/formagic/inputs/list_typeahead.coffee
-- app/assets/javascripts/formagic/inputs/markdown.coffee
-- app/assets/javascripts/formagic/inputs/markdown_toolbar.coffee
 - app/assets/javascripts/formagic/inputs/password.coffee
 - app/assets/javascripts/formagic/inputs/redactor.coffee
 - app/assets/javascripts/formagic/inputs/redactor_character.coffee
@@ -128,25 +131,28 @@ files:
 - app/assets/javascripts/vendor/jquery.textarea_autosize.js
 - app/assets/javascripts/vendor/jquery.typeahead.js
 - app/assets/javascripts/vendor/marked.js
+- app/assets/javascripts/vendor/mode-css.js
 - app/assets/javascripts/vendor/mode-html.js
+- app/assets/javascripts/vendor/mode-javascript.js
 - app/assets/javascripts/vendor/mode-markdown.js
 - app/assets/javascripts/vendor/moment.js
 - app/assets/javascripts/vendor/redactor.fixedtoolbar.js
 - app/assets/javascripts/vendor/redactor.table.js
 - app/assets/javascripts/vendor/select2.js
+- app/assets/javascripts/vendor/slip.js
 - app/assets/stylesheets/formagic.scss
 - app/assets/stylesheets/formagic/actions.scss
 - app/assets/stylesheets/formagic/array.scss
 - app/assets/stylesheets/formagic/checkbox.scss
 - app/assets/stylesheets/formagic/color.scss
 - app/assets/stylesheets/formagic/date.scss
+- app/assets/stylesheets/formagic/documents.scss
 - app/assets/stylesheets/formagic/file.scss
 - app/assets/stylesheets/formagic/form.scss
 - app/assets/stylesheets/formagic/group.scss
 - app/assets/stylesheets/formagic/image.scss
 - app/assets/stylesheets/formagic/list.scss
 - app/assets/stylesheets/formagic/markdown.scss
-- app/assets/stylesheets/formagic/nested-form.scss
 - app/assets/stylesheets/formagic/redactor-character.scss
 - app/assets/stylesheets/formagic/select.scss
 - app/assets/stylesheets/formagic/string.scss

data/app/assets/javascripts/formagic/inputs/markdown.coffee

@@ -1,94 +0,0 @@
-# -----------------------------------------------------------------------------
-# Author: Alexander Kravets <alex@slatestudio.com>,
-#         Slate Studio (http://www.slatestudio.com)
-# -----------------------------------------------------------------------------
-# INPUT MARKDOWN
-# -----------------------------------------------------------------------------
-# Markdown input supports syntax highlighting and optional compilation to html.
-#
-# Config options:
-#   label          - Input label
-#   aceOptions     - Custom options for overriding default ones
-#   htmlFieldName  - Input name for generated HTML content
-#   disableToolbar - Do not show shorcuts panel
-#
-# Input config example:
-#   body_md: { type: 'markdown', label: 'Article', htmlFieldName: 'body_html' }
-#
-# Dependencies:
-#= require vendor/marked
-#= require vendor/ace
-#= require vendor/mode-markdown
-#= require ./markdown_toolbar
-# -----------------------------------------------------------------------------
-class @InputMarkdown extends InputString
-  # PRIVATE ===================================================================
-
-  _add_input: ->
-    if @config.htmlFieldName
-      @$inputHtml =$ "<input type='hidden' name='[#{ @config.htmlFieldName }]' />"
-      if @object
-        @$inputHtml.val(@object[@config.htmlFieldName])
-      @$el.append @$inputHtml
-
-    @$input =$ "<input type='hidden' name='#{ @name }' value='#{ @_safe_value() }' />"
-    @$el.append @$input
-
-    @$editor =$ "<div></div>"
-    @$el.append @$editor
-
-    if ! @config.disableToolbar
-      @_add_toolbar()
-
-  _update_inputs: ->
-    md_source = @session.getValue()
-    @$input.val(md_source)
-    @$input.trigger('change')
-
-    if @$inputHtml
-      html = marked(md_source)
-      @$inputHtml.val(html)
-      @$inputHtml.trigger('change')
-
-  # PUBLIC ====================================================================
-
-  initialize: ->
-    @config.pluginConfig ||= {}
-    @config.beforeInitialize?(this)
-
-    @editor = ace.edit(@$editor.get(0))
-    @editor.$blockScrolling = Infinity
-
-    @session = @editor.getSession()
-    @session.setValue(@$input.val())
-    @session.setUseWrapMode(true)
-    @session.setMode("ace/mode/markdown")
-
-    # options: https://github.com/ajaxorg/ace/wiki/Configuring-Ace
-    aceOptions =
-      autoScrollEditorIntoView: true
-      minLines:                 5
-      maxLines:                 Infinity
-      showLineNumbers:          false
-      showGutter:               false
-      highlightActiveLine:      false
-      showPrintMargin:          false
-    $.merge(aceOptions, @config.pluginConfig)
-
-    @editor.setOptions aceOptions
-    @session.on 'change', (e) => @_update_inputs()
-    @_update_inputs()
-    @config.onInitialize?(this)
-
-  updateValue: (@value) ->
-    @session.setValue(@value)
-    @_update_inputs()
-
-  hash: (hash={}) ->
-    hash[@config.htmlFieldName] = @$inputHtml.val()
-    hash[@config.klassName]     = @$input.val()
-    return hash
-
-include(InputMarkdown, inputMarkdownToolbar)
-
-chr.formInputs['markdown'] = InputMarkdown