ckeditor 3.6.3 → 3.7.0.rc1
Sign up to get free protection for your applications and to get access to all the features.
- data/Gemfile +1 -1
- data/README.rdoc +14 -24
- data/app/assets/javascripts/ckeditor/application.js +5 -0
- data/app/assets/stylesheets/ckeditor/application.css +6 -0
- data/app/controllers/ckeditor/{base_controller.rb → application_controller.rb} +1 -2
- data/app/controllers/ckeditor/attachment_files_controller.rb +2 -2
- data/app/controllers/ckeditor/pictures_controller.rb +2 -2
- data/app/views/ckeditor/shared/_asset.html.erb +2 -2
- data/app/views/ckeditor/shared/_asset_tmpl.html.erb +1 -1
- data/app/views/layouts/{ckeditor.html.erb → ckeditor/application.html.erb} +4 -12
- data/config/locales/sv-SE.ckeditor.yml +8 -0
- data/config/locales/zh-CN.ckeditor.yml +8 -0
- data/config/routes.rb +3 -5
- data/lib/ckeditor.rb +2 -16
- data/lib/ckeditor/engine.rb +4 -1
- data/lib/ckeditor/hooks/formtastic.rb +9 -12
- data/lib/ckeditor/orm/active_record.rb +1 -1
- data/lib/ckeditor/utils.rb +14 -7
- data/lib/ckeditor/version.rb +1 -1
- data/lib/generators/ckeditor/install_generator.rb +48 -55
- data/lib/generators/ckeditor/templates/{models/active_record → active_record}/carrierwave/ckeditor/asset.rb +0 -0
- data/lib/generators/ckeditor/templates/{models/mongoid → active_record}/carrierwave/ckeditor/attachment_file.rb +1 -4
- data/lib/generators/ckeditor/templates/{models/active_record → active_record}/carrierwave/ckeditor/picture.rb +0 -0
- data/lib/generators/ckeditor/templates/{models/active_record → active_record}/carrierwave/migration.rb +0 -0
- data/lib/generators/ckeditor/templates/{models/active_record → active_record}/paperclip/ckeditor/asset.rb +0 -0
- data/lib/generators/ckeditor/templates/{models/active_record → active_record}/paperclip/ckeditor/attachment_file.rb +1 -4
- data/lib/generators/ckeditor/templates/{models/active_record → active_record}/paperclip/ckeditor/picture.rb +0 -0
- data/lib/generators/ckeditor/templates/{models/active_record → active_record}/paperclip/migration.rb +0 -0
- data/lib/generators/ckeditor/templates/{models/base → base}/carrierwave/uploaders/ckeditor_attachment_file_uploader.rb +0 -0
- data/lib/generators/ckeditor/templates/{models/base → base}/carrierwave/uploaders/ckeditor_picture_uploader.rb +0 -0
- data/lib/generators/ckeditor/templates/ckeditor.rb +0 -3
- data/lib/generators/ckeditor/templates/{models/mongoid → mongoid}/carrierwave/ckeditor/asset.rb +0 -0
- data/lib/generators/ckeditor/templates/{models/active_record → mongoid}/carrierwave/ckeditor/attachment_file.rb +1 -4
- data/lib/generators/ckeditor/templates/{models/mongoid → mongoid}/carrierwave/ckeditor/picture.rb +0 -0
- data/lib/generators/ckeditor/templates/{models/mongoid → mongoid}/paperclip/ckeditor/asset.rb +0 -0
- data/lib/generators/ckeditor/templates/{models/mongoid → mongoid}/paperclip/ckeditor/attachment_file.rb +1 -4
- data/lib/generators/ckeditor/templates/{models/mongoid → mongoid}/paperclip/ckeditor/picture.rb +0 -0
- data/test/ckeditor_test.rb +0 -14
- data/test/controllers/attachment_files_controller_test.rb +2 -0
- data/test/controllers/pictures_controller_test.rb +3 -0
- data/test/dummy/Rakefile +1 -1
- data/test/dummy/app/assets/javascripts/application.js +11 -0
- data/test/dummy/app/assets/stylesheets/application.css +7 -0
- data/test/dummy/{public → app/assets}/stylesheets/scaffold.css +0 -0
- data/test/dummy/app/views/layouts/application.html.erb +3 -3
- data/test/dummy/config/application.rb +11 -12
- data/test/dummy/config/boot.rb +7 -6
- data/test/dummy/config/database.yml +11 -0
- data/test/dummy/config/environments/development.rb +7 -3
- data/test/dummy/config/environments/production.rb +23 -12
- data/test/dummy/config/environments/test.rb +5 -1
- data/test/dummy/config/initializers/secret_token.rb +1 -1
- data/test/dummy/config/initializers/session_store.rb +1 -1
- data/test/dummy/config/initializers/wrap_parameters.rb +14 -0
- data/test/dummy/config/locales/en.yml +1 -1
- data/test/dummy/config/routes.rb +2 -0
- data/test/dummy/db/test.sqlite3 +0 -0
- data/test/dummy/log/test.log +3681 -6331
- data/test/generators/install_generator_test.rb +58 -15
- data/test/integration/posts_test.rb +5 -5
- data/test/models/attachment_file_test.rb +3 -1
- data/test/models/picture_test.rb +1 -0
- data/test/models/utils_test.rb +19 -0
- data/test/support/controller_hooks.rb +27 -0
- data/test/support/routes.txt +4 -0
- data/test/test_helper.rb +0 -1
- data/test/tmp/app/models/ckeditor/attachment_file.rb +1 -4
- data/test/tmp/config/initializers/ckeditor.rb +18 -0
- data/test/tmp/config/routes.rb +6 -0
- metadata +185 -236
- data/lib/generators/ckeditor/models_generator.rb +0 -70
- data/lib/generators/ckeditor/templates/ckeditor/config.js +0 -65
- data/lib/generators/ckeditor/templates/ckeditor/filebrowser/images/gal_add.jpg +0 -0
- data/lib/generators/ckeditor/templates/ckeditor/filebrowser/images/gal_add.png +0 -0
- data/lib/generators/ckeditor/templates/ckeditor/filebrowser/images/gal_del.png +0 -0
- data/lib/generators/ckeditor/templates/ckeditor/filebrowser/images/gal_more.gif +0 -0
- data/lib/generators/ckeditor/templates/ckeditor/filebrowser/images/preloader.gif +0 -0
- data/lib/generators/ckeditor/templates/ckeditor/filebrowser/images/thumbs/ckfnothumb.gif +0 -0
- data/lib/generators/ckeditor/templates/ckeditor/filebrowser/images/thumbs/mp3.gif +0 -0
- data/lib/generators/ckeditor/templates/ckeditor/filebrowser/images/thumbs/pdf.gif +0 -0
- data/lib/generators/ckeditor/templates/ckeditor/filebrowser/images/thumbs/rar.gif +0 -0
- data/lib/generators/ckeditor/templates/ckeditor/filebrowser/images/thumbs/swf.gif +0 -0
- data/lib/generators/ckeditor/templates/ckeditor/filebrowser/images/thumbs/xls.gif +0 -0
- data/lib/generators/ckeditor/templates/ckeditor/filebrowser/javascripts/application.js +0 -223
- data/lib/generators/ckeditor/templates/ckeditor/filebrowser/stylesheets/uploader.css +0 -115
- data/lib/generators/ckeditor/templates/ckeditor/plugins/attachment/dialogs/attachment.js +0 -1
- data/lib/generators/ckeditor/templates/ckeditor/plugins/attachment/images/attachment.png +0 -0
- data/lib/generators/ckeditor/templates/ckeditor/plugins/attachment/lang/en.js +0 -10
- data/lib/generators/ckeditor/templates/ckeditor/plugins/attachment/lang/ru.js +0 -10
- data/lib/generators/ckeditor/templates/ckeditor/plugins/attachment/lang/uk.js +0 -10
- data/lib/generators/ckeditor/templates/ckeditor/plugins/attachment/plugin.js +0 -1
- data/lib/generators/ckeditor/templates/ckeditor/plugins/embed/dialogs/embed.js +0 -1
- data/lib/generators/ckeditor/templates/ckeditor/plugins/embed/images/embed.png +0 -0
- data/lib/generators/ckeditor/templates/ckeditor/plugins/embed/lang/en.js +0 -9
- data/lib/generators/ckeditor/templates/ckeditor/plugins/embed/lang/ru.js +0 -9
- data/lib/generators/ckeditor/templates/ckeditor/plugins/embed/lang/uk.js +0 -9
- data/lib/generators/ckeditor/templates/ckeditor/plugins/embed/plugin.js +0 -1
- data/test/dummy/db/schema.rb +0 -36
- data/test/dummy/public/javascripts/application.js +0 -2
- data/test/dummy/public/javascripts/controls.js +0 -965
- data/test/dummy/public/javascripts/dragdrop.js +0 -974
- data/test/dummy/public/javascripts/effects.js +0 -1123
- data/test/dummy/public/javascripts/prototype.js +0 -6001
- data/test/dummy/public/javascripts/rails.js +0 -191
- data/test/generators/models_generator_test.rb +0 -61
- data/test/routes_test.rb +0 -47
@@ -1,191 +0,0 @@
|
|
1
|
-
(function() {
|
2
|
-
// Technique from Juriy Zaytsev
|
3
|
-
// http://thinkweb2.com/projects/prototype/detecting-event-support-without-browser-sniffing/
|
4
|
-
function isEventSupported(eventName) {
|
5
|
-
var el = document.createElement('div');
|
6
|
-
eventName = 'on' + eventName;
|
7
|
-
var isSupported = (eventName in el);
|
8
|
-
if (!isSupported) {
|
9
|
-
el.setAttribute(eventName, 'return;');
|
10
|
-
isSupported = typeof el[eventName] == 'function';
|
11
|
-
}
|
12
|
-
el = null;
|
13
|
-
return isSupported;
|
14
|
-
}
|
15
|
-
|
16
|
-
function isForm(element) {
|
17
|
-
return Object.isElement(element) && element.nodeName.toUpperCase() == 'FORM'
|
18
|
-
}
|
19
|
-
|
20
|
-
function isInput(element) {
|
21
|
-
if (Object.isElement(element)) {
|
22
|
-
var name = element.nodeName.toUpperCase()
|
23
|
-
return name == 'INPUT' || name == 'SELECT' || name == 'TEXTAREA'
|
24
|
-
}
|
25
|
-
else return false
|
26
|
-
}
|
27
|
-
|
28
|
-
var submitBubbles = isEventSupported('submit'),
|
29
|
-
changeBubbles = isEventSupported('change')
|
30
|
-
|
31
|
-
if (!submitBubbles || !changeBubbles) {
|
32
|
-
// augment the Event.Handler class to observe custom events when needed
|
33
|
-
Event.Handler.prototype.initialize = Event.Handler.prototype.initialize.wrap(
|
34
|
-
function(init, element, eventName, selector, callback) {
|
35
|
-
init(element, eventName, selector, callback)
|
36
|
-
// is the handler being attached to an element that doesn't support this event?
|
37
|
-
if ( (!submitBubbles && this.eventName == 'submit' && !isForm(this.element)) ||
|
38
|
-
(!changeBubbles && this.eventName == 'change' && !isInput(this.element)) ) {
|
39
|
-
// "submit" => "emulated:submit"
|
40
|
-
this.eventName = 'emulated:' + this.eventName
|
41
|
-
}
|
42
|
-
}
|
43
|
-
)
|
44
|
-
}
|
45
|
-
|
46
|
-
if (!submitBubbles) {
|
47
|
-
// discover forms on the page by observing focus events which always bubble
|
48
|
-
document.on('focusin', 'form', function(focusEvent, form) {
|
49
|
-
// special handler for the real "submit" event (one-time operation)
|
50
|
-
if (!form.retrieve('emulated:submit')) {
|
51
|
-
form.on('submit', function(submitEvent) {
|
52
|
-
var emulated = form.fire('emulated:submit', submitEvent, true)
|
53
|
-
// if custom event received preventDefault, cancel the real one too
|
54
|
-
if (emulated.returnValue === false) submitEvent.preventDefault()
|
55
|
-
})
|
56
|
-
form.store('emulated:submit', true)
|
57
|
-
}
|
58
|
-
})
|
59
|
-
}
|
60
|
-
|
61
|
-
if (!changeBubbles) {
|
62
|
-
// discover form inputs on the page
|
63
|
-
document.on('focusin', 'input, select, texarea', function(focusEvent, input) {
|
64
|
-
// special handler for real "change" events
|
65
|
-
if (!input.retrieve('emulated:change')) {
|
66
|
-
input.on('change', function(changeEvent) {
|
67
|
-
input.fire('emulated:change', changeEvent, true)
|
68
|
-
})
|
69
|
-
input.store('emulated:change', true)
|
70
|
-
}
|
71
|
-
})
|
72
|
-
}
|
73
|
-
|
74
|
-
function handleRemote(element) {
|
75
|
-
var method, url, params;
|
76
|
-
|
77
|
-
var event = element.fire("ajax:before");
|
78
|
-
if (event.stopped) return false;
|
79
|
-
|
80
|
-
if (element.tagName.toLowerCase() === 'form') {
|
81
|
-
method = element.readAttribute('method') || 'post';
|
82
|
-
url = element.readAttribute('action');
|
83
|
-
params = element.serialize();
|
84
|
-
} else {
|
85
|
-
method = element.readAttribute('data-method') || 'get';
|
86
|
-
url = element.readAttribute('href');
|
87
|
-
params = {};
|
88
|
-
}
|
89
|
-
|
90
|
-
new Ajax.Request(url, {
|
91
|
-
method: method,
|
92
|
-
parameters: params,
|
93
|
-
evalScripts: true,
|
94
|
-
|
95
|
-
onComplete: function(request) { element.fire("ajax:complete", request); },
|
96
|
-
onSuccess: function(request) { element.fire("ajax:success", request); },
|
97
|
-
onFailure: function(request) { element.fire("ajax:failure", request); }
|
98
|
-
});
|
99
|
-
|
100
|
-
element.fire("ajax:after");
|
101
|
-
}
|
102
|
-
|
103
|
-
function handleMethod(element) {
|
104
|
-
var method = element.readAttribute('data-method'),
|
105
|
-
url = element.readAttribute('href'),
|
106
|
-
csrf_param = $$('meta[name=csrf-param]')[0],
|
107
|
-
csrf_token = $$('meta[name=csrf-token]')[0];
|
108
|
-
|
109
|
-
var form = new Element('form', { method: "POST", action: url, style: "display: none;" });
|
110
|
-
element.parentNode.insert(form);
|
111
|
-
|
112
|
-
if (method !== 'post') {
|
113
|
-
var field = new Element('input', { type: 'hidden', name: '_method', value: method });
|
114
|
-
form.insert(field);
|
115
|
-
}
|
116
|
-
|
117
|
-
if (csrf_param) {
|
118
|
-
var param = csrf_param.readAttribute('content'),
|
119
|
-
token = csrf_token.readAttribute('content'),
|
120
|
-
field = new Element('input', { type: 'hidden', name: param, value: token });
|
121
|
-
form.insert(field);
|
122
|
-
}
|
123
|
-
|
124
|
-
form.submit();
|
125
|
-
}
|
126
|
-
|
127
|
-
|
128
|
-
document.on("click", "*[data-confirm]", function(event, element) {
|
129
|
-
var message = element.readAttribute('data-confirm');
|
130
|
-
if (!confirm(message)) event.stop();
|
131
|
-
});
|
132
|
-
|
133
|
-
document.on("click", "a[data-remote]", function(event, element) {
|
134
|
-
if (event.stopped) return;
|
135
|
-
handleRemote(element);
|
136
|
-
event.stop();
|
137
|
-
});
|
138
|
-
|
139
|
-
document.on("click", "a[data-method]", function(event, element) {
|
140
|
-
if (event.stopped) return;
|
141
|
-
handleMethod(element);
|
142
|
-
event.stop();
|
143
|
-
});
|
144
|
-
|
145
|
-
document.on("submit", function(event) {
|
146
|
-
var element = event.findElement(),
|
147
|
-
message = element.readAttribute('data-confirm');
|
148
|
-
if (message && !confirm(message)) {
|
149
|
-
event.stop();
|
150
|
-
return false;
|
151
|
-
}
|
152
|
-
|
153
|
-
var inputs = element.select("input[type=submit][data-disable-with]");
|
154
|
-
inputs.each(function(input) {
|
155
|
-
input.disabled = true;
|
156
|
-
input.writeAttribute('data-original-value', input.value);
|
157
|
-
input.value = input.readAttribute('data-disable-with');
|
158
|
-
});
|
159
|
-
|
160
|
-
var element = event.findElement("form[data-remote]");
|
161
|
-
if (element) {
|
162
|
-
handleRemote(element);
|
163
|
-
event.stop();
|
164
|
-
}
|
165
|
-
});
|
166
|
-
|
167
|
-
document.on("ajax:after", "form", function(event, element) {
|
168
|
-
var inputs = element.select("input[type=submit][disabled=true][data-disable-with]");
|
169
|
-
inputs.each(function(input) {
|
170
|
-
input.value = input.readAttribute('data-original-value');
|
171
|
-
input.removeAttribute('data-original-value');
|
172
|
-
input.disabled = false;
|
173
|
-
});
|
174
|
-
});
|
175
|
-
|
176
|
-
Ajax.Responders.register({
|
177
|
-
onCreate: function(request) {
|
178
|
-
var csrf_meta_tag = $$('meta[name=csrf-token]')[0];
|
179
|
-
|
180
|
-
if (csrf_meta_tag) {
|
181
|
-
var header = 'X-CSRF-Token',
|
182
|
-
token = csrf_meta_tag.readAttribute('content');
|
183
|
-
|
184
|
-
if (!request.options.requestHeaders) {
|
185
|
-
request.options.requestHeaders = {};
|
186
|
-
}
|
187
|
-
request.options.requestHeaders[header] = token;
|
188
|
-
}
|
189
|
-
}
|
190
|
-
});
|
191
|
-
})();
|
@@ -1,61 +0,0 @@
|
|
1
|
-
require "test_helper"
|
2
|
-
|
3
|
-
class ModelsGeneratorTest < Rails::Generators::TestCase
|
4
|
-
tests Ckeditor::Generators::ModelsGenerator
|
5
|
-
destination File.expand_path("../../tmp", __FILE__)
|
6
|
-
setup :prepare_destination
|
7
|
-
|
8
|
-
test "models and migration for active_record orm via paperclip" do
|
9
|
-
run_generator %w(--orm=active_record --backend=paperclip)
|
10
|
-
|
11
|
-
assert_file "app/models/ckeditor/asset.rb"
|
12
|
-
assert_file "app/models/ckeditor/picture.rb"
|
13
|
-
assert_file "app/models/ckeditor/attachment_file.rb"
|
14
|
-
|
15
|
-
assert_migration "db/migrate/create_ckeditor_assets.rb" do |migration|
|
16
|
-
assert_class_method :up, migration do |up|
|
17
|
-
assert_match /create_table/, up
|
18
|
-
end
|
19
|
-
end
|
20
|
-
end
|
21
|
-
|
22
|
-
test "models and migration for active_record orm via carrierwave" do
|
23
|
-
run_generator %w(--orm=active_record --backend=carrierwave)
|
24
|
-
|
25
|
-
assert_file "app/models/ckeditor/asset.rb"
|
26
|
-
assert_file "app/models/ckeditor/picture.rb"
|
27
|
-
assert_file "app/models/ckeditor/attachment_file.rb"
|
28
|
-
|
29
|
-
assert_file "app/uploaders/ckeditor_attachment_file_uploader.rb"
|
30
|
-
assert_file "app/uploaders/ckeditor_picture_uploader.rb"
|
31
|
-
|
32
|
-
assert_migration "db/migrate/create_ckeditor_assets.rb" do |migration|
|
33
|
-
assert_class_method :up, migration do |up|
|
34
|
-
assert_match /create_table/, up
|
35
|
-
end
|
36
|
-
end
|
37
|
-
end
|
38
|
-
|
39
|
-
test "models for mongoid orm via paperclip" do
|
40
|
-
run_generator %w(--orm=mongoid --backend=paperclip)
|
41
|
-
|
42
|
-
assert_file "app/models/ckeditor/asset.rb"
|
43
|
-
assert_file "app/models/ckeditor/picture.rb"
|
44
|
-
assert_file "app/models/ckeditor/attachment_file.rb"
|
45
|
-
|
46
|
-
assert_no_migration "db/migrate/create_ckeditor_assets.rb"
|
47
|
-
end
|
48
|
-
|
49
|
-
test "models for mongoid orm via carrierwave" do
|
50
|
-
run_generator %w(--orm=mongoid --backend=carrierwave)
|
51
|
-
|
52
|
-
assert_file "app/models/ckeditor/asset.rb"
|
53
|
-
assert_file "app/models/ckeditor/picture.rb"
|
54
|
-
assert_file "app/models/ckeditor/attachment_file.rb"
|
55
|
-
|
56
|
-
assert_file "app/uploaders/ckeditor_attachment_file_uploader.rb"
|
57
|
-
assert_file "app/uploaders/ckeditor_picture_uploader.rb"
|
58
|
-
|
59
|
-
assert_no_migration "db/migrate/create_ckeditor_assets.rb"
|
60
|
-
end
|
61
|
-
end
|
data/test/routes_test.rb
DELETED
@@ -1,47 +0,0 @@
|
|
1
|
-
require 'test_helper'
|
2
|
-
|
3
|
-
class CkeditorRoutingTest < ActionController::TestCase
|
4
|
-
test "should route to pictures" do
|
5
|
-
assert_generates "/ckeditor/pictures", { :controller => "ckeditor/pictures", :action => "index"}
|
6
|
-
assert_generates "/ckeditor/pictures/1", { :controller => "ckeditor/pictures", :action => "destroy", :id => 1}
|
7
|
-
end
|
8
|
-
|
9
|
-
test "should route to attachment_files" do
|
10
|
-
assert_generates "/ckeditor/attachment_files", { :controller => "ckeditor/attachment_files", :action => "index"}
|
11
|
-
assert_generates "/ckeditor/attachment_files/1", { :controller => "ckeditor/attachment_files", :action => "destroy", :id => 1}
|
12
|
-
end
|
13
|
-
|
14
|
-
test 'map index pictures' do
|
15
|
-
assert_named_route "/ckeditor/pictures", :ckeditor_pictures_path
|
16
|
-
assert_recognizes({:controller=>"ckeditor/pictures", :action=>"index"}, {:path => '/ckeditor/pictures', :method => :get})
|
17
|
-
end
|
18
|
-
|
19
|
-
test 'map create picture' do
|
20
|
-
assert_recognizes({:controller => 'ckeditor/pictures', :action => 'create'}, {:path => '/ckeditor/pictures', :method => :post})
|
21
|
-
end
|
22
|
-
|
23
|
-
test 'map destroy picture' do
|
24
|
-
assert_named_route "/ckeditor/pictures/1", :ckeditor_picture_path, 1
|
25
|
-
assert_recognizes({:controller => 'ckeditor/pictures', :action => 'destroy', :id => "1"}, {:path => '/ckeditor/pictures/1', :method => :delete})
|
26
|
-
end
|
27
|
-
|
28
|
-
test 'map index attachment_files' do
|
29
|
-
assert_named_route "/ckeditor/attachment_files", :ckeditor_attachment_files_path
|
30
|
-
assert_recognizes({:controller => 'ckeditor/attachment_files', :action => 'index'}, {:path => '/ckeditor/attachment_files', :method => :get})
|
31
|
-
end
|
32
|
-
|
33
|
-
test 'map create attachment_file' do
|
34
|
-
assert_recognizes({:controller => 'ckeditor/attachment_files', :action => 'create'}, {:path => '/ckeditor/attachment_files', :method => :post})
|
35
|
-
end
|
36
|
-
|
37
|
-
test 'map destroy attachment_file' do
|
38
|
-
assert_named_route "/ckeditor/attachment_files/1", :ckeditor_attachment_file_path, 1
|
39
|
-
assert_recognizes({:controller => 'ckeditor/attachment_files', :action => 'destroy', :id => "1"}, {:path => '/ckeditor/attachment_files/1', :method => :delete})
|
40
|
-
end
|
41
|
-
|
42
|
-
protected
|
43
|
-
|
44
|
-
def assert_named_route(result, *args)
|
45
|
-
assert_equal result, @routes.url_helpers.send(*args)
|
46
|
-
end
|
47
|
-
end
|