tb_core 1.3.6 → 1.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6bf453f0beae57a1071c09c8d17bb2af451d8f1
-  data.tar.gz: 24fcc7c6774cf0957886dd28675a5fa9fd8cdc6f
+  metadata.gz: 9e447994850df42f2d94bace466371bcc952a6bb
+  data.tar.gz: 3d2363bf502fdfc50ce228186bfd403ab7401498
 SHA512:
-  metadata.gz: 6e82de4ddd86404ab8a03bce734b7bc6a5f57e63e1528d9b9c4e58b687cb0eee48bb41f6921997463e68d7062bc09f76f52cd4b3bdfebb544ba75e3db32b33e5
-  data.tar.gz: ed7a6ac11107b0602eb0d21a50af16662657aa0462e7a288acb5f00c9dda9c78e364478d45e9d0b6a93438f2629fb7bb92a401df7a57da0978ddeca17586defe
+  metadata.gz: 7f5a259c7068627afd84e7fccb1e45704660d5db6e814e8295a20d2d5318b86f30f92750e1602ee805700a2ca2abcac5ec3074fc300a48eae176e84060a3da9c
+  data.tar.gz: 53bb1073d4757b407f1d2a0ddffbff390c45a4c2b00579eabb09e5b9502b83e3f14badb3b5500434afc68bb198419e078a789b2e0cd745f158f14cc31c00173f

data/app/assets/javascripts/admin/core/application.js

@@ -1,5 +1,4 @@
 //= require jquery
-//= require tinymce-jquery
 //= require bootstrap-sprockets
 //= require ../../tb_core
 //= require_self
@@ -31,7 +30,6 @@ $(document).ready(function() {
       remote: url +".js",
       show:true
     });
-
     return false;
   });
 

data/app/assets/javascripts/admin/core/editor.js

@@ -3,6 +3,8 @@ spud.admin.editor = {};
 (function(){
 
   var editor = spud.admin.editor;
+  
+  editor.tinymce = {loaded:false};
 
   var registeredPlugins = [
     'autolink','lists','image','link','media','paste', 'code'
@@ -39,44 +41,23 @@ spud.admin.editor = {};
     "q[cite],samp,select[disabled|multiple|name|size],small," +
     "textarea[cols|rows|disabled|name|readonly],tt,var,big";
 
-  var extendedValidElements = [];
+  var extendedValidElements = [
+    "iframe[src|width|height|name|align|frameborder|allowfullscreen]"
+  ];
 
   editor.init = function(options) {
-    editor.monitorFormatters();
-    options = options || {};
-    var selector = options.selector || 'textarea.tinymce';
-    $(selector).each(function() {
-      var $this = $(this);
-      var dataFormat = $this.attr('data-format');
-      if(dataFormat == 'Markdown'){
-        console.warn('Markdown is not supported at this time.');
-      }
-      editor.initMCEWithOptions(this, options || {});
-    });
-
-  };
-
-  editor.monitorFormatters = function() {
-    $('select[data-formatter]').off('onchange');
-    $('select[data-formatter]').change(editor.formatterChanged);
-  };
-
-  editor.formatterChanged = function() {
-    var formatId = $(this).attr('data-formatter');
-    editor.unload('#' + formatId);
-    $('#' + formatId).attr('data-format',$(this).val());
-    editor.init({selector: '#' + formatId});
+    editor.unload();
+    editor.checkAndCallTinyMce(options);
   };
 
   editor.initMCEWithOptions = function(element, options){
-
     var theme = options.theme || 'modern';
     var height = options.height || 400;
     var width = options.width || $(element).width();
     var buttons = options.buttons || registeredButtons;
     var plugins = options.plugins || registeredPlugins;
 
-    $(element).tinymce({
+    $(element).tinymce({ 
       theme: theme,
       language: 'en',
       menubar: false,
@@ -92,7 +73,9 @@ spud.admin.editor = {};
   };
 
   editor.unload = function() {
-    tinyMCE.remove();
+    if(typeof tinymce != "undefined"){
+      tinyMCE.remove();
+    }
   };
 
   editor.registerPlugin = function(pluginName){
@@ -121,10 +104,39 @@ spud.admin.editor = {};
       console.warn('rowNum parameter is no longer used.');
     }
     if(typeof(buttonNameOrArray) == 'object'){
-      registeredButtons.concat(buttonNameOrArray);
+      registeredButtons = registeredButtons.concat(buttonNameOrArray);
     }
     else{
       registeredButtons.push(buttonNameOrArray);
     }
   };
+  
+  var loadScript = null;
+
+  editor.checkAndCallTinyMce = function(options){
+    options = options || {};
+    var selector = options.selector || 'textarea.tinymce';
+    var $elements = $(selector);
+
+    if($elements.length === 0){
+      return;
+    }
+
+    if(loadScript === null){
+      loadScript = $.when(
+        $.ajax({url: '//cdn.tinymce.com/4.3/tinymce.jquery.min.js', dataType: 'script', cache: true}),
+        $.ajax({url: '//cdn.tinymce.com/4.3/jquery.tinymce.min.js', dataType: 'script', cache: true})
+      ).done(function(){
+        $('body').trigger("tb:tinymce-loaded");
+        editor.tinymce.loaded = true;
+      });
+    }
+
+    loadScript.done(function(){
+      $elements.each(function(){
+        editor.initMCEWithOptions(this, options);
+      });
+    });
+  };
+
 })();

data/app/assets/javascripts/tb_core.js.erb

@@ -2,5 +2,8 @@
 //= require_directory ./tb_core
 
 (function(){
-  window.tb = {};
+  window.tb = {
+
+  };
+  
 })();

data/app/assets/stylesheets/admin/core/application.scss

@@ -104,6 +104,17 @@ body {
 }
 
 // Forms
+.form-horizontal .col-sm-10 .help-block{
+  margin: 5px 0;
+  &:last-child{
+    margin-bottom: 0;
+  }
+}
+.form-horizontal .form-sub-title{
+  margin: 0;
+  border-bottom: 1px solid #ccc;
+  padding: 0 0 4px 0;
+}
 
 // Old Errors
 div.field_with_errors {

data/app/controllers/spud/application_controller.rb

@@ -1,7 +1,5 @@
 class Spud::ApplicationController < ActionController::Base
 
-  ActiveSupport.run_load_hooks(:spud_application_controller, self)
-
   protect_from_forgery
   helper_method :current_user_session, :current_user, :current_user_id, :back_or_default
   before_action :check_requires_password_change
@@ -130,4 +128,6 @@ private
     handle_request_error(error)
   end
 
+  ActiveSupport.run_load_hooks(:spud_application_controller, self)
+
 end

data/lib/spud_core/engine.rb

@@ -7,7 +7,6 @@ require 'autoprefixer-rails'
 require 'will_paginate'
 require 'will_paginate-bootstrap'
 require 'breadcrumbs_on_rails'
-require 'tinymce-rails'
 
 # this should eventually replace the Spud::Core namespace
 module TbCore

data/lib/spud_core/version.rb

@@ -1,5 +1,5 @@
 module Spud
   module Core
-    VERSION = "1.3.6"
+    VERSION = "1.3.7"
   end
 end

data/lib/tb_core/form_builder.rb

@@ -20,8 +20,13 @@ class TbCore::FormBuilder < ActionView::Helpers::FormBuilder
 
   # Build a label
   #
-  def tb_label(attribute)
-    label(attribute, @object.class.human_attribute_name(attribute), :class => 'col-sm-2 control-label')
+  def tb_label(attribute, options={})
+    if options[:label_text] != nil
+      text = options[:label_text]
+    else
+      text = @object.class.human_attribute_name(attribute)  
+    end
+    label(attribute, text, :class => 'col-sm-2 control-label')
   end
 
   # Builds an input field with error message
@@ -36,8 +41,11 @@ class TbCore::FormBuilder < ActionView::Helpers::FormBuilder
         concat send(input_type, attribute, objectify_options(options))
       end
       error_message = @object.errors[attribute].first
+      if options[:help_text]
+        concat content_tag(:p, @template.raw(options[:help_text]), :class => 'help-block')
+      end
       if error_message
-        concat content_tag(:p, error_message, :class => 'help-block form-field-error')
+        concat content_tag(:p, error_message, :class => 'form-error form-error-inline')
       end
     end
   end
@@ -130,11 +138,19 @@ class TbCore::FormBuilder < ActionView::Helpers::FormBuilder
   # ie, container div + label + input + error message
   #
 
+  def tb_sub_title(text)
+    content_tag :div, options.merge(:class => 'form-group') do
+      content_tag :div, :class => 'col-sm-offset-2 col-sm-10' do
+        content_tag :h4, text, :class => 'form-sub-title'
+      end
+    end
+  end
+
   # Builds a form group, label, and input tag all in one
   #
   def tb_input_field(attribute, input_type=nil, options={})
     tb_form_group() do
-      concat tb_label(attribute)
+      concat tb_label(attribute, options)
       if block_given?
         concat(
           tb_input_field_tag(attribute) do

data/spec/dummy/config/application.rb

@@ -57,6 +57,7 @@ module Dummy
 
     # Version of your assets, change this if you want to expire all your assets
     config.assets.version = '1.0'
+
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tb_core
 version: !ruby/object:Gem::Version
-  version: 1.3.6
+  version: 1.3.7
 platform: ruby
 authors:
 - Greg Woods
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-22 00:00:00.000000000 Z
+date: 2016-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -178,20 +178,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: tinymce-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.1.6
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.1.6
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -503,7 +489,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Twice Baked Core Engine