Fixes for rails 8 support
This commit is contained in:
@@ -0,0 +1,11 @@
|
|||||||
|
CHANGELOG
|
||||||
|
================
|
||||||
|
|
||||||
|
v3.0.0 and before
|
||||||
|
-----------------------
|
||||||
|
- integrate with a rails 8 application
|
||||||
|
|
||||||
|
|
||||||
|
V2.0.0 and before
|
||||||
|
----------------------
|
||||||
|
- Was a long time ago
|
||||||
@@ -18,6 +18,7 @@ group :assets do
|
|||||||
gem 'font-awesome-rails'
|
gem 'font-awesome-rails'
|
||||||
# gem 'tinymce-rails'
|
# gem 'tinymce-rails'
|
||||||
gem 'pickadate-rails'
|
gem 'pickadate-rails'
|
||||||
|
gem 'momentjs-rails'
|
||||||
end
|
end
|
||||||
|
|
||||||
gem 'simply_stored' , github: 'bterkuile/simply_stored'
|
gem 'simply_stored' , github: 'bterkuile/simply_stored'
|
||||||
|
|||||||
@@ -36,7 +36,6 @@ This will add some gems you might like anyway, here a list:
|
|||||||
|
|
||||||
* bourbon # NOOOOOO
|
* bourbon # NOOOOOO
|
||||||
* jquery-rails
|
* jquery-rails
|
||||||
* tinymce-rails
|
|
||||||
* sass-rails
|
* sass-rails
|
||||||
* paperclip
|
* paperclip
|
||||||
* email_validator (validates :email, email: true)
|
* email_validator (validates :email, email: true)
|
||||||
|
|||||||
@@ -8,6 +8,7 @@
|
|||||||
#= require ace/mode-handlebars
|
#= require ace/mode-handlebars
|
||||||
#= require ace/mode-yaml
|
#= require ace/mode-yaml
|
||||||
#= require ace/mode-haml
|
#= require ace/mode-haml
|
||||||
|
#= require ace/mode-slim
|
||||||
# require tinymce-jquery
|
# require tinymce-jquery
|
||||||
# require tinymce
|
# require tinymce
|
||||||
#= require pickadate/picker
|
#= require pickadate/picker
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ class HtmlEdit
|
|||||||
setup: ->
|
setup: ->
|
||||||
#ACE
|
#ACE
|
||||||
locale_field = $('#page_locale')
|
locale_field = $('#page_locale')
|
||||||
$('.html-content').each (i, el)->
|
$('.html-content').each (i, el) ->
|
||||||
text_field = $(el)
|
text_field = $(el)
|
||||||
template_field = $("##{text_field.attr('id')}_template")
|
template_field = $("##{text_field.attr('id')}_template")
|
||||||
ace_div = $('<div></div>').addClass('ace-div')
|
ace_div = $('<div></div>').addClass('ace-div')
|
||||||
@@ -13,9 +13,10 @@ class HtmlEdit
|
|||||||
editor = ace.edit(ace_div.get(0))
|
editor = ace.edit(ace_div.get(0))
|
||||||
editor.setTheme 'ace/theme/monokai'
|
editor.setTheme 'ace/theme/monokai'
|
||||||
if template_field.length
|
if template_field.length
|
||||||
|
text_field.before '<a href="https://emblemjs.com/" target="_blank">This is a template language. For reference, visit: emblemjs.com</a>'
|
||||||
editor.setValue template_field.val(), -1
|
editor.setValue template_field.val(), -1
|
||||||
editor.getSession().setMode 'ace/mode/haml'
|
editor.getSession().setMode 'ace/mode/slim'
|
||||||
console.log "Editing haml"
|
console.log "Editing Emblem using Slim mode for ACE editor"
|
||||||
else
|
else
|
||||||
editor.setValue text_field.val(), -1
|
editor.setValue text_field.val(), -1
|
||||||
editor.getSession().setMode 'ace/mode/handlebars'
|
editor.getSession().setMode 'ace/mode/handlebars'
|
||||||
@@ -33,6 +34,9 @@ class HtmlEdit
|
|||||||
result_value = template(template_vars)
|
result_value = template(template_vars)
|
||||||
template_field.val value
|
template_field.val value
|
||||||
text_field.val result_value
|
text_field.val result_value
|
||||||
|
console.log "Succesfull conversion of template to HTML"
|
||||||
|
catch error
|
||||||
|
console.log error.message
|
||||||
else
|
else
|
||||||
text_field.val value
|
text_field.val value
|
||||||
editor.getSession().on 'change', rebuild_html
|
editor.getSession().on 'change', rebuild_html
|
||||||
|
|||||||
@@ -1,13 +1 @@
|
|||||||
<% cmtool = Cmtool::Engine.routes.url_helpers %>
|
<% cmtool = Cmtool::Engine.routes.url_helpers %>
|
||||||
$ ->
|
|
||||||
$('textarea.mceEditor, .editor_full').tinymce
|
|
||||||
theme: 'modern'
|
|
||||||
plugins: ['image', 'link', 'table', 'searchreplace', 'code']
|
|
||||||
language: tinymce_language
|
|
||||||
image_list: '<%= cmtool.images_path(format: :js) %>'
|
|
||||||
relative_urls: false
|
|
||||||
removed_menuitems: 'newdocument'
|
|
||||||
apply_source_formatting: true
|
|
||||||
$('.editor_basic').tinymce
|
|
||||||
theme: 'modern'
|
|
||||||
language: tinymce_language
|
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ html lang="en"
|
|||||||
link href="/favicon.ico" rel="shortcut icon"
|
link href="/favicon.ico" rel="shortcut icon"
|
||||||
= csrf_meta_tags
|
= csrf_meta_tags
|
||||||
javascript:
|
javascript:
|
||||||
var tinymce_language = '#{I18n.locale}';
|
var i18n_language = '#{I18n.locale}';
|
||||||
|
|
||||||
/! Le HTML5 shim, for IE6-8 support of HTML elements
|
/! Le HTML5 shim, for IE6-8 support of HTML elements
|
||||||
/[if lt IE 9]
|
/[if lt IE 9]
|
||||||
|
|||||||
@@ -28,4 +28,5 @@ Gem::Specification.new do |s|
|
|||||||
s.add_runtime_dependency "ace-rails-ap", ">= 0"
|
s.add_runtime_dependency "ace-rails-ap", ">= 0"
|
||||||
s.add_runtime_dependency "font-awesome-rails", ">= 0"
|
s.add_runtime_dependency "font-awesome-rails", ">= 0"
|
||||||
s.add_runtime_dependency "pickadate-rails", ">= 0"
|
s.add_runtime_dependency "pickadate-rails", ">= 0"
|
||||||
|
s.add_runtime_dependency 'momentjs-rails', '>= 0'
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -0,0 +1 @@
|
|||||||
|
Rails.application.config.assets.precompile += %w[ cmtool/application.css cmtool/application.js ]
|
||||||
@@ -1,3 +1,5 @@
|
|||||||
|
require 'momentjs-rails'
|
||||||
|
|
||||||
require "cmtool/engine"
|
require "cmtool/engine"
|
||||||
require 'cmtool/includes/user'
|
require 'cmtool/includes/user'
|
||||||
require 'cmtool/includes/page'
|
require 'cmtool/includes/page'
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
module Cmtool
|
module Cmtool
|
||||||
VERSION = "2.0.0"
|
VERSION = "3.0.0"
|
||||||
end
|
end
|
||||||
|
|||||||
Reference in New Issue
Block a user