caboose-cms 0.4.112 → 0.4.113
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 +8 -8
- data/app/assets/javascripts/caboose/model/bound_richtext.js +18 -5
- data/app/models/caboose/block.rb +2 -1
- data/lib/caboose/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
---
|
|
2
2
|
!binary "U0hBMQ==":
|
|
3
3
|
metadata.gz: !binary |-
|
|
4
|
-
|
|
4
|
+
NTUyMWFmMjc2ZDkyODAxMWVjNTg4ODAzOTQyZTkyMGY2YmQzM2MwNg==
|
|
5
5
|
data.tar.gz: !binary |-
|
|
6
|
-
|
|
6
|
+
OTkyMTliNGQ5NGM4MzJjMGY2ODZiMmExYTA3NTg2NGU2YmZlMTFiOQ==
|
|
7
7
|
!binary "U0hBNTEy":
|
|
8
8
|
metadata.gz: !binary |-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
9
|
+
NmExZGQ1ZGYwMDA5OGRhMzk0N2M4MzI2YWZlYThlM2Y2ZDI0OWI2ZDNhM2M4
|
|
10
|
+
MDgxZWM2N2NhMjFkOWQ0YzkyMjE3NWRkYTQ2NTYxYmJlYzE1YmMzOGUzOGMx
|
|
11
|
+
OTlhYjZlN2MyZDA0ZjJlZDhhMzdhMTkzYmYxNDU1OWIzNDU3MGE=
|
|
12
12
|
data.tar.gz: !binary |-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
13
|
+
MjI3ZmQ1NjRhZTA3ODMyMmNiYmE0ZTEzY2YxMjg3YTMyYWY1NDBkYzliMTFj
|
|
14
|
+
MDc3ZTgzNzdjMDI0OTVjOGQ0ODIxZmRmYmNjMGVkM2IzYzhkYzRiZWVjYTRm
|
|
15
|
+
NTgwMDMxNGVmMWIxNDQyZTMyNzMwNjQ2OGMzYjBmMTRhZjM1NDE=
|
|
@@ -28,11 +28,24 @@ BoundRichText = BoundControl.extend({
|
|
|
28
28
|
var h = $('#'+this.el+'_placeholder').outerHeight();
|
|
29
29
|
$('#'+this.el).attr('placeholder', 'empty').css('padding-top', '+=' + h).css('height', '-=' + h);
|
|
30
30
|
|
|
31
|
-
var this2 = this;
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
31
|
+
var this2 = this;
|
|
32
|
+
//$('#'+this.el).ready(function(){
|
|
33
|
+
// var ed = tinymce.get(this2.el);
|
|
34
|
+
// if (ed)
|
|
35
|
+
// {
|
|
36
|
+
// //alert('Removing editor...');
|
|
37
|
+
// //tinymce.remove(ed);
|
|
38
|
+
// tinymce.execCommand("mceRemoveControl", true, this2.el);
|
|
39
|
+
// }
|
|
40
|
+
// tinymce.EditorManager.execCommand("mceAddEditor", true, this2.el);
|
|
41
|
+
//});
|
|
42
|
+
|
|
43
|
+
setTimeout(function() {
|
|
44
|
+
//tinymce.EditorManager.execCommand("mceAddEditor", false, this2.el);
|
|
45
|
+
//tinymce.EditorManager.execCommand("mceAddEditor", false, this2.el);
|
|
46
|
+
tinymce.execCommand("mceAddEditor", false, this2.el);
|
|
47
|
+
//var ed = tinymce.EditorManager.createEditor(this2.el);
|
|
48
|
+
//alert(ed);
|
|
36
49
|
//var ed = new tinymce.Editor(this2.el, {
|
|
37
50
|
// setup: function (editor) {
|
|
38
51
|
// editor.on('init', function (e) { alert('Test'); });
|
data/app/models/caboose/block.rb
CHANGED
|
@@ -11,7 +11,8 @@ class Caboose::Block < ActiveRecord::Base
|
|
|
11
11
|
has_attached_file :file, :path => '/uploads/:id.:extension'
|
|
12
12
|
do_not_validate_attachment_file_type :file
|
|
13
13
|
has_attached_file :image,
|
|
14
|
-
:path => 'uploads/:id_:style.:extension',
|
|
14
|
+
:path => 'uploads/:id_:style.:extension',
|
|
15
|
+
:default_url => "http://placehold.it/300x300",
|
|
15
16
|
:styles => {
|
|
16
17
|
:tiny => '160x120>',
|
|
17
18
|
:thumb => '400x300>',
|
data/lib/caboose/version.rb
CHANGED