caboose-cms 0.9.136 → 0.9.137
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/app/assets/javascripts/caboose/block_content_controller_dragdrop.js +32 -11
- data/app/assets/javascripts/caboose/block_modal_controllers/richtext_modal_controller.js +3 -3
- data/app/assets/stylesheets/caboose/admin_edit_page_content_dragdrop.scss +9 -4
- data/app/helpers/caboose/application_helper.rb +1 -1
- data/lib/caboose/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 3cbefac74a3129d8da10bd3c9e6a7b7b42744292
|
|
4
|
+
data.tar.gz: f899356389647067fbab2e3920c6ddf7f16476a4
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 7ab3bb6a373b4a87a032c524f4b5bb0a20b02d46789c12ab37ef96f7073548874c723aedc6a9209ca0a9449ee3b1420c23890bc7c3d3f2e7c18ef49b96e87b8f
|
|
7
|
+
data.tar.gz: 77cd58c747d7ef0e03a711e733d5cbefeb493c2257206df440ae0f22161f646ac6ce8065c93540d459242c921e33d8e0afa4389c22cb972e5990b62b672e7c88
|
|
@@ -48,27 +48,48 @@ BlockContentController.prototype = {
|
|
|
48
48
|
$.each(that.inline_classes, function(k1, c) {
|
|
49
49
|
$.each($('.' + c), function(k2, b) {
|
|
50
50
|
// var el = $(b).find('.value').first();
|
|
51
|
-
if ( !$(b).hasClass('cke_editable') ) {
|
|
51
|
+
if ( !$(b).hasClass('cke_editable') && $(b).closest("#the_modal").length == 0 ) {
|
|
52
|
+
|
|
52
53
|
$(b).attr('contenteditable','true');
|
|
53
54
|
var target_id = $(b).data('rtid');
|
|
54
|
-
// var block_id = $(b).attr('id').replace('block_','');
|
|
55
55
|
var editor = CKEDITOR.inline( $(b).attr('id') );
|
|
56
56
|
|
|
57
|
+
var is_saved = true;
|
|
58
|
+
|
|
57
59
|
editor.on('change', function(ev) {
|
|
58
60
|
that.is_modified();
|
|
59
61
|
$(b).css('background-color','#ffffd0').css('color','black');
|
|
62
|
+
is_saved = false;
|
|
60
63
|
});
|
|
61
64
|
|
|
62
65
|
editor.on('blur', function(ev) {
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
66
|
+
if ( !is_saved ) {
|
|
67
|
+
var html = $(b).html();
|
|
68
|
+
$.ajax({
|
|
69
|
+
url: that.base_url() + '/' + target_id + '/value',
|
|
70
|
+
type: 'put',
|
|
71
|
+
data: { value: html },
|
|
72
|
+
success: function(resp) {
|
|
73
|
+
$(b).css('background-color','').css('color','');
|
|
74
|
+
is_saved = true;
|
|
75
|
+
}
|
|
76
|
+
});
|
|
77
|
+
}
|
|
78
|
+
});
|
|
79
|
+
|
|
80
|
+
$(b).on('mouseleave', function(ev) {
|
|
81
|
+
if ( !is_saved ) {
|
|
82
|
+
var html = $(b).html();
|
|
83
|
+
$.ajax({
|
|
84
|
+
url: that.base_url() + '/' + target_id + '/value',
|
|
85
|
+
type: 'put',
|
|
86
|
+
data: { value: html },
|
|
87
|
+
success: function(resp) {
|
|
88
|
+
$(b).css('background-color','').css('color','');
|
|
89
|
+
is_saved = true;
|
|
90
|
+
}
|
|
91
|
+
});
|
|
92
|
+
}
|
|
72
93
|
});
|
|
73
94
|
|
|
74
95
|
}
|
|
@@ -9,7 +9,7 @@ var RichtextModalController = BlockModalController.extend({
|
|
|
9
9
|
assets_to_include: function()
|
|
10
10
|
{
|
|
11
11
|
return [
|
|
12
|
-
'//
|
|
12
|
+
'//cdnjs.cloudflare.com/ajax/libs/tinymce/4.7.13/tinymce.min.js'
|
|
13
13
|
//'//tinymce.cachefly.net/4.0/tinymce.min.js',
|
|
14
14
|
//'caboose/tinymce_init.js'
|
|
15
15
|
]
|
|
@@ -48,7 +48,7 @@ var RichtextModalController = BlockModalController.extend({
|
|
|
48
48
|
nice_name: 'Content',
|
|
49
49
|
type: 'richtext',
|
|
50
50
|
value: that.block.value,
|
|
51
|
-
width:
|
|
51
|
+
width: 798,
|
|
52
52
|
height: 300,
|
|
53
53
|
fixed_placeholder: false,
|
|
54
54
|
after_update: function() {
|
|
@@ -74,7 +74,7 @@ var RichtextModalController = BlockModalController.extend({
|
|
|
74
74
|
{
|
|
75
75
|
tinymce.init({
|
|
76
76
|
selector: 'textarea.tinymce',
|
|
77
|
-
width: '
|
|
77
|
+
width: '798px',
|
|
78
78
|
height: '300px',
|
|
79
79
|
convert_urls: false,
|
|
80
80
|
plugins: 'advlist autolink lists link image charmap print preview hr anchor pagebreak searchreplace wordcount visualblocks visualchars code fullscreen insertdatetime media nonbreaking table contextmenu directionality emoticons template paste textcolor caboose',
|
|
@@ -80,6 +80,11 @@
|
|
|
80
80
|
top: 0;
|
|
81
81
|
}
|
|
82
82
|
}
|
|
83
|
+
#the_modal {
|
|
84
|
+
#modal_controls {
|
|
85
|
+
margin-top: 10px;
|
|
86
|
+
}
|
|
87
|
+
}
|
|
83
88
|
|
|
84
89
|
#cboxTopLeft, #cboxTopRight, #cboxBottomLeft, #cboxBottomRight, #cboxMiddleLeft, #cboxMiddleRight, #cboxTopCenter, #cboxBottomCenter, #cboxClose {
|
|
85
90
|
background: #fff !important;
|
|
@@ -125,9 +130,9 @@
|
|
|
125
130
|
.richtext-block {
|
|
126
131
|
z-index: 6;
|
|
127
132
|
}
|
|
128
|
-
#colorbox, #cboxOverlay, #cboxWrapper {
|
|
129
|
-
|
|
130
|
-
}
|
|
133
|
+
// #colorbox, #cboxOverlay, #cboxWrapper {
|
|
134
|
+
// z-index: 10000000;
|
|
135
|
+
// }
|
|
131
136
|
|
|
132
137
|
body > .ui-draggable-dragging {
|
|
133
138
|
width: 95px;
|
|
@@ -290,7 +295,7 @@ body > .container, body > .mm-page > .container {
|
|
|
290
295
|
&.published {
|
|
291
296
|
background-color: #353535;
|
|
292
297
|
#m-unpub { display: none; }
|
|
293
|
-
a[href*="revert"], a[href*="publish"] {
|
|
298
|
+
a[href*="revert"], a[href*="publish"], a[href*="preview"] {
|
|
294
299
|
display: none;
|
|
295
300
|
}
|
|
296
301
|
}
|
|
@@ -2,7 +2,7 @@ module Caboose
|
|
|
2
2
|
module ApplicationHelper
|
|
3
3
|
def caboose_tinymce
|
|
4
4
|
return "
|
|
5
|
-
<script src='https://
|
|
5
|
+
<script src='https://cdnjs.cloudflare.com/ajax/libs/tinymce/4.7.13/tinymce.min.js'></script>
|
|
6
6
|
<script type='text/javascript'>
|
|
7
7
|
//<![CDATA[
|
|
8
8
|
tinyMCE.init({
|
data/lib/caboose/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: caboose-cms
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.9.
|
|
4
|
+
version: 0.9.137
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- William Barry
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2018-05-
|
|
11
|
+
date: 2018-05-23 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: pg
|