kiteditor 1.0.12 → 1.0.13

Sign up to get free protection for your applications and to get access to all the features.
Files changed (289) hide show
  1. data/{lib/generators/mercury/install/images/templates → app/controllers/mercury}/images_controller.rb +0 -0
  2. data/{lib/generators/mercury/install/images/templates/ar_paperclip_image.rb → app/models/mercury/image.rb} +0 -7
  3. data/app/views/layouts/mercury.html.erb +20 -10
  4. data/app/views/mercury/modals/character.html +1 -1
  5. data/app/views/mercury/modals/htmleditor.html +7 -3
  6. data/app/views/mercury/modals/link.html +51 -37
  7. data/app/views/mercury/modals/media.html +0 -102
  8. data/app/views/mercury/modals/table.html +73 -79
  9. data/app/views/mercury/panels/snippets.html +1 -6
  10. data/app/views/mercury/snippets/example/options.html.erb +27 -23
  11. data/{lib/generators/mercury/install/images/templates/ar_paperclip_image_migration.rb → db/migrate/20110526035601_create_mercury_images.rb} +0 -0
  12. data/features/loading/loading.feature +2 -5
  13. data/features/loading/user_interface.feature +7 -9
  14. data/features/regions/{full → editable}/advanced_editing.feature +0 -0
  15. data/features/regions/editable/basic_editing.feature +195 -0
  16. data/features/regions/{full → editable}/inserting_links.feature +19 -20
  17. data/features/regions/{full → editable}/inserting_media.feature +18 -36
  18. data/features/regions/{full → editable}/inserting_snippets.feature +18 -28
  19. data/features/regions/{full → editable}/inserting_special_characters.feature +2 -2
  20. data/features/regions/editable/inserting_tables.feature +109 -0
  21. data/features/regions/{full → editable}/pasting.feature +0 -0
  22. data/features/regions/{full → editable}/uploading_images.feature +0 -0
  23. data/features/regions/{markdown → markupable}/advanced_editing.feature +0 -0
  24. data/features/regions/{markdown → markupable}/basic_editing.feature +0 -0
  25. data/features/regions/{markdown → markupable}/inserting_links.feature +0 -0
  26. data/features/regions/{markdown → markupable}/inserting_media.feature +0 -0
  27. data/features/regions/{markdown → markupable}/inserting_snippets.feature +0 -0
  28. data/features/regions/{markdown → markupable}/inserting_special_characters.feature +0 -0
  29. data/features/regions/{markdown → markupable}/inserting_tables.feature +0 -0
  30. data/features/regions/{image → markupable}/uploading_images.feature +0 -0
  31. data/features/regions/{snippets → snippetable}/advanced_editing.feature +0 -0
  32. data/features/regions/{snippets → snippetable}/basic_editing.feature +0 -0
  33. data/features/regions/{snippets → snippetable}/inserting_snippets.feature +0 -0
  34. data/features/saving/saving.feature +8 -8
  35. data/features/step_definitions/mercury_steps.rb +438 -1
  36. data/features/support/env.rb +1 -11
  37. data/{lib/mercury/cucumber → features}/support/mercury_contents.rb +3 -3
  38. data/{lib/mercury/cucumber → features}/support/mercury_selectors.rb +20 -0
  39. data/features/support/selectors.rb +0 -23
  40. data/lib/generators/mercury/install/install_generator.rb +23 -12
  41. data/lib/generators/mercury/install/{images/templates → templates}/mongoid_paperclip_image.rb +0 -0
  42. data/lib/mercury/authentication.rb +0 -1
  43. data/lib/mercury-rails.rb +2 -1
  44. data/spec/javascripts/mercury/{dialog_spec.coffee → dialog_spec.js.coffee} +12 -11
  45. data/spec/javascripts/mercury/dialogs/backcolor_spec.js.coffee +3 -2
  46. data/spec/javascripts/mercury/dialogs/forecolor_spec.js.coffee +4 -3
  47. data/spec/javascripts/mercury/dialogs/formatblock_spec.js.coffee +3 -2
  48. data/spec/javascripts/mercury/dialogs/snippetpanel_spec.js.coffee +3 -2
  49. data/spec/javascripts/mercury/dialogs/style_spec.js.coffee +3 -2
  50. data/spec/javascripts/mercury/lightview_spec.js.coffee +142 -180
  51. data/spec/javascripts/mercury/mercury_spec.js.coffee +13 -19
  52. data/spec/javascripts/mercury/modal_spec.js.coffee +148 -192
  53. data/spec/javascripts/mercury/modals/htmleditor_spec.js.coffee +5 -4
  54. data/spec/javascripts/mercury/modals/insertcharacter_spec.js.coffee +3 -2
  55. data/spec/javascripts/mercury/modals/insertlink_spec.js.coffee +34 -107
  56. data/spec/javascripts/mercury/modals/insertmedia_spec.js.coffee +26 -106
  57. data/spec/javascripts/mercury/modals/insertsnippet_spec.js.coffee +3 -2
  58. data/spec/javascripts/mercury/modals/inserttable_spec.js.coffee +40 -50
  59. data/spec/javascripts/mercury/page_editor_spec.js.coffee +80 -124
  60. data/spec/javascripts/mercury/palette_spec.js.coffee +5 -4
  61. data/spec/javascripts/mercury/panel_spec.js.coffee +12 -9
  62. data/spec/javascripts/mercury/region_spec.js.coffee +17 -22
  63. data/spec/javascripts/mercury/regions/{full_spec.js.coffee → editable_spec.js.coffee} +28 -26
  64. data/spec/javascripts/mercury/regions/{markdown_spec.js.coffee → markupable_spec.js.coffee} +34 -32
  65. data/spec/javascripts/mercury/regions/{snippets_spec.js.coffee → snippetable_spec.js.coffee} +55 -54
  66. data/spec/javascripts/mercury/select_spec.js.coffee +5 -4
  67. data/spec/javascripts/mercury/snippet_spec.js.coffee +16 -92
  68. data/spec/javascripts/mercury/snippet_toolbar_spec.js.coffee +16 -31
  69. data/spec/javascripts/mercury/statusbar_spec.js.coffee +10 -9
  70. data/spec/javascripts/mercury/table_editor_spec.js.coffee +2 -1
  71. data/spec/javascripts/mercury/toolbar.button_group_spec.js.coffee +9 -7
  72. data/spec/javascripts/mercury/toolbar.button_spec.js.coffee +26 -55
  73. data/spec/javascripts/mercury/toolbar.expander_spec.js.coffee +13 -13
  74. data/spec/javascripts/mercury/toolbar_spec.js.coffee +14 -43
  75. data/spec/javascripts/mercury/tooltip_spec.js.coffee +2 -1
  76. data/spec/javascripts/mercury/uploader_spec.js.coffee +33 -47
  77. data/spec/javascripts/{support/event_simulation.js → spec_helper.js} +2 -0
  78. data/spec/javascripts/{fixtures → templates}/mercury/dialog.html +0 -0
  79. data/spec/javascripts/{fixtures → templates}/mercury/dialogs/backcolor.html +0 -0
  80. data/spec/javascripts/{fixtures → templates}/mercury/dialogs/forecolor.html +0 -0
  81. data/spec/javascripts/{fixtures → templates}/mercury/dialogs/formatblock.html +0 -0
  82. data/spec/javascripts/{fixtures → templates}/mercury/dialogs/snippetpanel.html +0 -0
  83. data/spec/javascripts/{fixtures → templates}/mercury/dialogs/style.html +0 -0
  84. data/spec/javascripts/{fixtures → templates}/mercury/lightview.html +0 -0
  85. data/spec/javascripts/{fixtures → templates}/mercury/modal.html +0 -0
  86. data/spec/javascripts/{fixtures → templates}/mercury/modals/htmleditor.html +0 -0
  87. data/spec/javascripts/{fixtures → templates}/mercury/modals/insertcharacter.html +0 -0
  88. data/spec/javascripts/templates/mercury/modals/insertlink.html +30 -0
  89. data/spec/javascripts/templates/mercury/modals/insertmedia.html +35 -0
  90. data/spec/javascripts/{fixtures → templates}/mercury/modals/insertsnippet.html +0 -0
  91. data/spec/javascripts/templates/mercury/modals/inserttable.html +27 -0
  92. data/spec/javascripts/{fixtures → templates}/mercury/page_editor.html +4 -4
  93. data/spec/javascripts/{fixtures → templates}/mercury/palette.html +0 -0
  94. data/spec/javascripts/{fixtures → templates}/mercury/panel.html +0 -0
  95. data/spec/javascripts/templates/mercury/region.html +2 -0
  96. data/spec/javascripts/templates/mercury/regions/editable.html +3 -0
  97. data/spec/javascripts/templates/mercury/regions/snippetable.html +4 -0
  98. data/spec/javascripts/{fixtures → templates}/mercury/select.html +0 -0
  99. data/spec/javascripts/{fixtures → templates}/mercury/snippet.html +0 -0
  100. data/spec/javascripts/{fixtures → templates}/mercury/snippet_toolbar.html +0 -0
  101. data/spec/javascripts/{fixtures → templates}/mercury/statusbar.html +0 -0
  102. data/spec/javascripts/{fixtures → templates}/mercury/table_editor.html +0 -0
  103. data/spec/javascripts/{fixtures → templates}/mercury/toolbar.button.html +0 -0
  104. data/spec/javascripts/{fixtures → templates}/mercury/toolbar.button_group.html +0 -0
  105. data/spec/javascripts/{fixtures → templates}/mercury/toolbar.expander.html +0 -0
  106. data/spec/javascripts/{fixtures → templates}/mercury/toolbar.html +0 -0
  107. data/spec/javascripts/{fixtures → templates}/mercury/tooltip.html +0 -0
  108. data/spec/javascripts/{fixtures → templates}/mercury/uploader.html +0 -0
  109. data/{app → vendor}/assets/images/mercury/button.png +0 -0
  110. data/{app → vendor}/assets/images/mercury/close.png +0 -0
  111. data/{app → vendor}/assets/images/mercury/loading-dark.gif +0 -0
  112. data/{app → vendor}/assets/images/mercury/loading-light.gif +0 -0
  113. data/{app → vendor}/assets/images/mercury/missing-image.png +0 -0
  114. data/{app → vendor}/assets/images/mercury/search-icon.png +0 -0
  115. data/{app → vendor}/assets/images/mercury/temp-logo.png +0 -0
  116. data/{app/assets/javascripts → vendor/assets/javascripts/mercury/dependencies}/jquery-1.7.js +0 -0
  117. data/{app → vendor}/assets/javascripts/mercury/dependencies/jquery-ui-1.8.13.custom.js +0 -0
  118. data/{app → vendor}/assets/javascripts/mercury/dependencies/jquery.additions.js +13 -103
  119. data/{app → vendor}/assets/javascripts/mercury/dependencies/jquery.htmlClean.js +0 -0
  120. data/{app → vendor}/assets/javascripts/mercury/dependencies/liquidmetal.js +0 -0
  121. data/{app → vendor}/assets/javascripts/mercury/dependencies/showdown.js +0 -0
  122. data/{app → vendor}/assets/javascripts/mercury/dialog.js.coffee +0 -0
  123. data/{app → vendor}/assets/javascripts/mercury/dialogs/backcolor.js.coffee +0 -0
  124. data/{app → vendor}/assets/javascripts/mercury/dialogs/forecolor.js.coffee +1 -1
  125. data/{app → vendor}/assets/javascripts/mercury/dialogs/formatblock.js.coffee +0 -0
  126. data/{app → vendor}/assets/javascripts/mercury/dialogs/snippetpanel.js.coffee +1 -1
  127. data/{app → vendor}/assets/javascripts/mercury/dialogs/style.js.coffee +0 -0
  128. data/{app → vendor}/assets/javascripts/mercury/finalize.js.coffee +0 -0
  129. data/{app → vendor}/assets/javascripts/mercury/history_buffer.js.coffee +0 -0
  130. data/{app → vendor}/assets/javascripts/mercury/lightview.js.coffee +17 -38
  131. data/{features/regions/markdown/uploading_images.feature → vendor/assets/javascripts/mercury/locales/da.locale.js.coffee} +0 -0
  132. data/{app → vendor}/assets/javascripts/mercury/locales/de.locale.js.coffee +10 -4
  133. data/{app → vendor}/assets/javascripts/mercury/locales/es.locale.js.coffee +9 -3
  134. data/{app → vendor}/assets/javascripts/mercury/locales/example.local.js.coffee +5 -3
  135. data/{app → vendor}/assets/javascripts/mercury/locales/fr.locale.js.coffee +9 -3
  136. data/{app → vendor}/assets/javascripts/mercury/locales/it.locale.js.coffee +9 -3
  137. data/{app → vendor}/assets/javascripts/mercury/locales/ko.local.js.coffee +10 -4
  138. data/{app → vendor}/assets/javascripts/mercury/locales/nl.locale.js.coffee +9 -3
  139. data/{app → vendor}/assets/javascripts/mercury/locales/pt.locale.js.coffee +9 -3
  140. data/{app → vendor}/assets/javascripts/mercury/locales/sv.local.js.coffee +9 -3
  141. data/{app → vendor}/assets/javascripts/mercury/locales/swedish_chef.locale.js.coffee +9 -3
  142. data/{app → vendor}/assets/javascripts/mercury/mercury.js.coffee +1 -10
  143. data/{app → vendor}/assets/javascripts/mercury/modal.js.coffee +40 -62
  144. data/{app → vendor}/assets/javascripts/mercury/modals/htmleditor.js.coffee +2 -3
  145. data/{app → vendor}/assets/javascripts/mercury/modals/insertcharacter.js.coffee +0 -1
  146. data/{app → vendor}/assets/javascripts/mercury/modals/insertsnippet.js.coffee +0 -2
  147. data/vendor/assets/javascripts/mercury/modals/inserttable.js.coffee +54 -0
  148. data/{app → vendor}/assets/javascripts/mercury/native_extensions.js.coffee +6 -0
  149. data/{app → vendor}/assets/javascripts/mercury/page_editor.js.coffee +50 -84
  150. data/{app → vendor}/assets/javascripts/mercury/palette.js.coffee +1 -1
  151. data/{app → vendor}/assets/javascripts/mercury/panel.js.coffee +2 -3
  152. data/{app → vendor}/assets/javascripts/mercury/plugins/save_as_xml/mercury/page_editor.js.coffee +2 -2
  153. data/{app → vendor}/assets/javascripts/mercury/plugins/save_as_xml/plugin.js +0 -0
  154. data/{app → vendor}/assets/javascripts/mercury/region.js.coffee +17 -18
  155. data/{app/assets/javascripts/mercury/regions/full.js.coffee → vendor/assets/javascripts/mercury/regions/editable.js.coffee} +31 -41
  156. data/{app/assets/javascripts/mercury/regions/markdown.js.coffee → vendor/assets/javascripts/mercury/regions/markupable.js.coffee} +24 -29
  157. data/{app → vendor}/assets/javascripts/mercury/regions/simple.js.coffee +54 -11
  158. data/{app/assets/javascripts/mercury/regions/snippets.js.coffee → vendor/assets/javascripts/mercury/regions/snippetable.js.coffee} +9 -10
  159. data/{app → vendor}/assets/javascripts/mercury/select.js.coffee +1 -1
  160. data/{app → vendor}/assets/javascripts/mercury/snippet_toolbar.js.coffee +6 -19
  161. data/{app → vendor}/assets/javascripts/mercury/statusbar.js.coffee +0 -0
  162. data/{app → vendor}/assets/javascripts/mercury/support/history.js +0 -0
  163. data/{app → vendor}/assets/javascripts/mercury/table_editor.js.coffee +0 -16
  164. data/{app → vendor}/assets/javascripts/mercury/toolbar.button.js.coffee +30 -45
  165. data/{app → vendor}/assets/javascripts/mercury/toolbar.button_group.js.coffee +2 -2
  166. data/{app → vendor}/assets/javascripts/mercury/toolbar.expander.js.coffee +4 -4
  167. data/{app → vendor}/assets/javascripts/mercury/toolbar.js.coffee +6 -10
  168. data/{app → vendor}/assets/javascripts/mercury/tooltip.js.coffee +0 -0
  169. data/{app → vendor}/assets/javascripts/mercury/uploader.js.coffee +19 -37
  170. data/{app → vendor}/assets/javascripts/mercury.js +87 -60
  171. data/vendor/assets/javascripts/mercury_loader.js +193 -0
  172. data/vendor/assets/javascripts/mercury_overrides.js +6 -0
  173. data/{app → vendor}/assets/stylesheets/mercury/all_images.css.erb +2 -6
  174. data/{app → vendor}/assets/stylesheets/mercury/dialog.css +8 -21
  175. data/{app → vendor}/assets/stylesheets/mercury/lightview.css +56 -6
  176. data/vendor/assets/stylesheets/mercury/mercury.css +151 -0
  177. data/{app → vendor}/assets/stylesheets/mercury/modal.css +32 -15
  178. data/{app → vendor}/assets/stylesheets/mercury/statusbar.css +0 -0
  179. data/{app → vendor}/assets/stylesheets/mercury/toolbar.css +1 -4
  180. data/{app → vendor}/assets/stylesheets/mercury/tooltip.css +0 -0
  181. data/{app → vendor}/assets/stylesheets/mercury/uploader.css +4 -4
  182. data/{app → vendor}/assets/stylesheets/mercury.css +5 -1
  183. data/vendor/assets/stylesheets/mercury_overrides.css +17 -0
  184. metadata +197 -367
  185. data/POST_INSTALL +0 -21
  186. data/app/assets/images/mercury/default-snippet.png +0 -0
  187. data/app/assets/images/mercury/toolbar/editable/buttons.png +0 -0
  188. data/app/assets/images/mercury/toolbar/primary/_expander.png +0 -0
  189. data/app/assets/images/mercury/toolbar/primary/_pressed.png +0 -0
  190. data/app/assets/images/mercury/toolbar/primary/action.png +0 -0
  191. data/app/assets/images/mercury/toolbar/primary/historypanel.png +0 -0
  192. data/app/assets/images/mercury/toolbar/primary/insertcharacter.png +0 -0
  193. data/app/assets/images/mercury/toolbar/primary/insertlink.png +0 -0
  194. data/app/assets/images/mercury/toolbar/primary/insertmedia.png +0 -0
  195. data/app/assets/images/mercury/toolbar/primary/inserttable.png +0 -0
  196. data/app/assets/images/mercury/toolbar/primary/inspectorpanel.png +0 -0
  197. data/app/assets/images/mercury/toolbar/primary/notespanel.png +0 -0
  198. data/app/assets/images/mercury/toolbar/primary/preview.png +0 -0
  199. data/app/assets/images/mercury/toolbar/primary/redo.png +0 -0
  200. data/app/assets/images/mercury/toolbar/primary/save.png +0 -0
  201. data/app/assets/images/mercury/toolbar/primary/snippetpanel.png +0 -0
  202. data/app/assets/images/mercury/toolbar/primary/tools.png +0 -0
  203. data/app/assets/images/mercury/toolbar/primary/undo.png +0 -0
  204. data/app/assets/images/mercury/toolbar/primary/user.png +0 -0
  205. data/app/assets/images/mercury/toolbar/snippets/buttons.png +0 -0
  206. data/app/assets/javascripts/mercury/locales/ar.locale.js.coffee +0 -201
  207. data/app/assets/javascripts/mercury/locales/da.locale.js.coffee +0 -208
  208. data/app/assets/javascripts/mercury/locales/hu.locale.js.coffee +0 -209
  209. data/app/assets/javascripts/mercury/locales/pl.locale.js.coffee +0 -213
  210. data/app/assets/javascripts/mercury/locales/ru.locale.js.coffee +0 -200
  211. data/app/assets/javascripts/mercury/locales/uk.locale.js.coffee +0 -200
  212. data/app/assets/javascripts/mercury/locales/zh.local.js.coffee +0 -203
  213. data/app/assets/javascripts/mercury/mercury-compiled.js +0 -10720
  214. data/app/assets/javascripts/mercury/modals/insertlink.js.coffee +0 -152
  215. data/app/assets/javascripts/mercury/modals/insertmedia.js.coffee +0 -132
  216. data/app/assets/javascripts/mercury/modals/inserttable.js.coffee +0 -68
  217. data/app/assets/javascripts/mercury/regions/image.js.coffee +0 -93
  218. data/app/assets/javascripts/mercury/snippet.js.coffee +0 -136
  219. data/app/assets/stylesheets/_mercury-bootstrap-overrides.scss +0 -61
  220. data/app/assets/stylesheets/_mercury-sass.scss +0 -33
  221. data/app/assets/stylesheets/mercury/bootstrap-ish.css +0 -1367
  222. data/app/assets/stylesheets/mercury/bootstrap-overrides.css +0 -61
  223. data/app/assets/stylesheets/mercury/mercury.css +0 -43
  224. data/app/helpers/mercury_helper.rb +0 -7
  225. data/app/views/layouts/mercury.html.haml +0 -19
  226. data/app/views/layouts/mercury.html.slim +0 -19
  227. data/app/views/mercury/snippets/no_options/preview.html.erb +0 -1
  228. data/config/routes.rb +0 -9
  229. data/features/generators/authentication.feature +0 -10
  230. data/features/generators/images.feature +0 -41
  231. data/features/generators/install.feature +0 -21
  232. data/features/regions/full/basic_editing.feature +0 -198
  233. data/features/regions/full/inserting_tables.feature +0 -109
  234. data/features/regions/simple/basic_editing.feature +0 -5
  235. data/features/step_definitions/custom_web_steps.rb +0 -22
  236. data/features/step_definitions/generator_steps.rb +0 -23
  237. data/features/support/aruba.rb +0 -28
  238. data/lib/generators/mercury/install/authentication/authentication_generator.rb +0 -17
  239. data/lib/generators/mercury/install/images/images_generator.rb +0 -47
  240. data/lib/mercury/cucumber/step_definitions/mercury_steps.rb +0 -408
  241. data/lib/mercury/cucumber/step_definitions.rb +0 -13
  242. data/lib/mercury/engine.rb +0 -19
  243. data/lib/mercury/rails.rb +0 -5
  244. data/lib/mercury/version.rb +0 -3
  245. data/spec/dummy/Rakefile +0 -7
  246. data/spec/dummy/app/assets/javascripts/application.js +0 -0
  247. data/spec/dummy/app/assets/javascripts/prototype.js +0 -6082
  248. data/spec/dummy/app/assets/stylesheets/application.css.scss +0 -110
  249. data/spec/dummy/app/controllers/application_controller.rb +0 -3
  250. data/spec/dummy/app/views/layouts/application.html.erb +0 -14
  251. data/spec/dummy/app/views/layouts/mercury.html.erb +0 -28
  252. data/spec/dummy/config/application.rb +0 -58
  253. data/spec/dummy/config/boot.rb +0 -10
  254. data/spec/dummy/config/database.yml +0 -10
  255. data/spec/dummy/config/environment.rb +0 -5
  256. data/spec/dummy/config/environments/development.rb +0 -37
  257. data/spec/dummy/config/environments/production.rb +0 -67
  258. data/spec/dummy/config/environments/test.rb +0 -37
  259. data/spec/dummy/config/initializers/backtrace_silencers.rb +0 -7
  260. data/spec/dummy/config/initializers/inflections.rb +0 -15
  261. data/spec/dummy/config/initializers/mime_types.rb +0 -5
  262. data/spec/dummy/config/initializers/secret_token.rb +0 -7
  263. data/spec/dummy/config/initializers/session_store.rb +0 -8
  264. data/spec/dummy/config/initializers/teabag.rb +0 -9
  265. data/spec/dummy/config/initializers/wrap_parameters.rb +0 -14
  266. data/spec/dummy/config/locales/en.yml +0 -5
  267. data/spec/dummy/config/routes.rb +0 -5
  268. data/spec/dummy/config.ru +0 -4
  269. data/spec/dummy/db/.gitkeep +0 -0
  270. data/spec/dummy/public/500.html +0 -25
  271. data/spec/dummy/public/blank.html +0 -1
  272. data/spec/dummy/public/favicon.ico +0 -0
  273. data/spec/dummy/public/images/bunny.gif +0 -0
  274. data/spec/dummy/public/images/bunny2.jpg +0 -0
  275. data/spec/dummy/public/index.html +0 -279
  276. data/spec/dummy/script/rails +0 -6
  277. data/spec/javascripts/fixtures/mercury/modals/insertlink.html +0 -67
  278. data/spec/javascripts/fixtures/mercury/modals/insertmedia.html +0 -87
  279. data/spec/javascripts/fixtures/mercury/modals/inserttable.html +0 -73
  280. data/spec/javascripts/fixtures/mercury/region.html +0 -6
  281. data/spec/javascripts/fixtures/mercury/regions/full.html +0 -1
  282. data/spec/javascripts/fixtures/mercury/regions/image.html +0 -1
  283. data/spec/javascripts/fixtures/mercury/regions/markdown.html +0 -1
  284. data/spec/javascripts/fixtures/mercury/regions/simple.html +0 -1
  285. data/spec/javascripts/fixtures/mercury/regions/snippets.html +0 -4
  286. data/spec/javascripts/mercury/regions/image_spec.js.coffee +0 -33
  287. data/spec/javascripts/mercury/regions/simple_spec.js.coffee +0 -32
  288. data/spec/javascripts/spec_helper.coffee +0 -4
  289. data/spec/teabag_env.rb +0 -32
File without changes
File without changes
File without changes
@@ -1,113 +1,23 @@
1
1
  /*
2
- * jQuery serializeObject Plugin: https://github.com/fojas/jQuery-serializeObject
2
+ * jQuery serializeObject Plugin
3
3
  *
4
4
  */
5
- !function($){
6
- $.serializeObject = function(obj){
7
- var o={},lookup=o,a = obj;
8
- $.each(a,function(){
9
- var named = this.name.replace(/\[([^\]]+)?\]/g,',$1').split(','),
10
- cap = named.length - 1,
11
- i = 0;
12
- for(;i<cap;i++) {
13
- // move down the tree - create objects or array if necessary
14
- if(lookup.push){ // this is an array, add values instead of setting them
15
- // push an object if this is an empty array or we are about to overwrite a value
16
- if( !lookup[lookup.length -1] // this is an empty array
17
- || lookup[lookup.length -1].constructor !== Object //current value is not a hash
18
- || lookup[lookup.length -1][named[i+1]] !== undefined //current item is already set
19
- ){
20
- lookup.push({});
21
- }
22
- lookup = lookup[lookup.length -1];
23
- } else {
24
- lookup = lookup[named[i]] = lookup[named[i]] || (named[i+1]==""?[]:{});
25
- }
26
- }
27
- if(lookup.push){
28
- lookup.push(this.value);
29
- }else{
30
- lookup[named[cap]]=this.value;
5
+ (function($) {
6
+ $.fn.serializeObject = function() {
7
+ var o = {};
8
+ var a = this.serializeArray();
9
+ jQuery.each(a, function() {
10
+ if (o[this.name] !== undefined) {
11
+ if (!o[this.name].push) o[this.name] = [o[this.name]];
12
+ o[this.name].push(this.value || '');
13
+ } else {
14
+ o[this.name] = this.value || '';
31
15
  }
32
- lookup = o;
33
16
  });
34
17
  return o;
35
18
  };
19
+ })(jQuery);
36
20
 
37
- $.deserializeObject = function deserializeObject(json,arr,prefix){
38
- var i,j,thisPrefix,objType;
39
- arr = arr || [];
40
- if(Object.prototype.toString.call(json) ==='[object Object]'){
41
- for(i in json){
42
- thisPrefix = prefix ? [prefix,'[',i,']'].join('') : i;
43
- if(json.hasOwnProperty(i)){
44
- objType = Object.prototype.toString.call(json[i])
45
- if(objType === '[object Array]'){
46
- for(j = 0,jsonLen = json[i].length;j<jsonLen;j++){
47
- deserializeObject(json[i][j],arr,thisPrefix+'[]');
48
- }
49
- }else if(objType === '[object Object]'){
50
- deserializeObject(json[i],arr,thisPrefix);
51
- }else {
52
- arr.push({
53
- name : thisPrefix,
54
- value : json[i]
55
- });
56
- }
57
- }
58
- }
59
- } else {
60
- arr.push({
61
- name : prefix,
62
- value : json
63
- });
64
- }
65
- return arr;
66
- }
67
-
68
- var check = function(){
69
- // older versions of jQuery do not have prop
70
- var propExists = !!$.fn.prop;
71
- return function(obj,checked){
72
- if(propExists) obj.prop('checked',checked);
73
- else obj.attr('checked', (checked ? 'checked' : null ));
74
- };
75
- }();
76
-
77
- $.applySerializedArray = function(form,obj){
78
- var $form = $(form).find('input,select,textarea'), el;
79
- check($form.filter(':checked'),false)
80
- for(var i = obj.length;i--;){
81
- el = $form.filter("[name='"+obj[i].name+"']");
82
- if(el.filter(':checkbox').length){
83
- if(el.val() == obj[i].value) check(el.filter(':checkbox'),true);
84
- }else if(el.filter(':radio').length){
85
- check(el.filter("[value='"+obj[i].value+"']"),true)
86
- } else {
87
- el.val(obj[i].value);
88
- }
89
- }
90
- };
91
-
92
- $.applySerializedObject = function(form, obj){
93
- $.applySerializedArray(form,$.deserializeObject(obj));
94
- };
95
-
96
- $.fn.serializeObject = $.fn.serializeObject || function(){
97
- return $.serializeObject(this.serializeArray());
98
- };
99
-
100
- $.fn.applySerializedObject = function(obj){
101
- $.applySerializedObject(this,obj);
102
- return this;
103
- };
104
-
105
- $.fn.applySerializedArray = function(obj){
106
- $.applySerializedArray(this,obj);
107
- return this;
108
- };
109
-
110
- }(jQuery);
111
21
  /*
112
22
  * jQuery Easing v1.3 - http://gsgd.co.uk/sandbox/jquery/easing/
113
23
  *
@@ -293,4 +203,4 @@ jQuery.extend(jQuery.easing, {
293
203
  return this;
294
204
  });
295
205
  };
296
- })(jQuery);
206
+ })(jQuery);
@@ -1,6 +1,6 @@
1
1
  @Mercury.dialogHandlers.foreColor = ->
2
2
  @element.find('.picker, .last-picked').on 'click', (event) =>
3
- color = jQuery(event.target).css('background-color').toHex()
3
+ color = jQuery(event.target).css('background-color')
4
4
  @element.find('.last-picked').css({background: color})
5
5
  @button.css({backgroundColor: color})
6
6
  Mercury.trigger('action', {action: 'foreColor', value: color})
@@ -7,4 +7,4 @@
7
7
 
8
8
  # when an element is dragged, set it so we have a global object
9
9
  @element.find('img[data-snippet]').on 'dragstart', ->
10
- Mercury.snippet = {name: jQuery(@).data('snippet'), hasOptions: !(jQuery(@).data('options') == false)}
10
+ Mercury.snippet = jQuery(@).data('snippet')
@@ -1,27 +1,19 @@
1
1
  @Mercury.lightview = (url, options = {}) ->
2
- Mercury.lightview.instance ||= new Mercury.Lightview(url, options)
3
- Mercury.lightview.instance.show(url, options)
4
- return Mercury.lightview.instance
2
+ Mercury.lightview.show(url, options)
3
+ return Mercury.lightview
5
4
 
5
+ jQuery.extend Mercury.lightview,
6
+ minWidth: 400
6
7
 
7
- class @Mercury.Lightview
8
-
9
- constructor: (@url, @options = {}) ->
10
-
11
-
12
- show: (url, options) ->
13
- @url = url || @url
14
- @options = options || @options
15
- @options.ujsHandling = true unless @options.ujsHandling == false
16
-
8
+ show: (@url, @options = {}) ->
17
9
  Mercury.trigger('focus:window')
18
- @initializeLightview()
10
+ @initialize()
19
11
  if @visible then @update() else @appear()
20
12
  if @options.content
21
- setTimeout((=> @loadContent(@options.content)), 500)
13
+ setTimeout 500, => @loadContent(@options.content)
22
14
 
23
15
 
24
- initializeLightview: ->
16
+ initialize: ->
25
17
  return if @initialized
26
18
  @build()
27
19
  @bindEvents()
@@ -54,10 +46,9 @@ class @Mercury.Lightview
54
46
  @titleElement.find('.mercury-lightview-close').on 'click', =>
55
47
  @hide()
56
48
 
57
- if @options.ujsHandling
58
- @element.on 'ajax:beforeSend', (event, xhr, options) =>
59
- options.success = (content) =>
60
- @loadContent(content)
49
+ @element.on 'ajax:beforeSend', (event, xhr, options) =>
50
+ options.success = (content) =>
51
+ @loadContent(content)
61
52
 
62
53
  jQuery(document).on 'keydown', (event) =>
63
54
  @hide() if event.keyCode == 27 && @visible
@@ -155,7 +146,7 @@ class @Mercury.Lightview
155
146
  return unless @url
156
147
  @element.addClass('loading')
157
148
  if Mercury.preloadedViews[@url]
158
- setTimeout((=> @loadContent(Mercury.preloadedViews[@url])), 10)
149
+ setTimeout(10, => @loadContent(Mercury.preloadedViews[@url]))
159
150
  else
160
151
  jQuery.ajax @url, {
161
152
  headers: Mercury.ajaxHeaders()
@@ -169,7 +160,7 @@ class @Mercury.Lightview
169
160
 
170
161
 
171
162
  loadContent: (data, options = null) ->
172
- @initializeLightview()
163
+ @initialize()
173
164
  @options = options || @options
174
165
  @setTitle()
175
166
  @loaded = true
@@ -184,20 +175,11 @@ class @Mercury.Lightview
184
175
  @options.afterLoad.call(@) if @options.afterLoad
185
176
  if @options.handler
186
177
  if Mercury.modalHandlers[@options.handler]
187
- if typeof(Mercury.modalHandlers[@options.handler]) == 'function'
188
- Mercury.modalHandlers[@options.handler].call(@)
189
- else
190
- jQuery.extend(@, Mercury.modalHandlers[@options.handler])
191
- @initialize()
178
+ Mercury.modalHandlers[@options.handler].call(@)
192
179
  else if Mercury.lightviewHandlers[@options.handler]
193
- if typeof(Mercury.lightviewHandlers[@options.handler]) == 'function'
194
- Mercury.lightviewHandlers[@options.handler].call(@)
195
- else
196
- jQuery.extend(@, Mercury.lightviewHandlers[@options.handler])
197
- @initialize()
180
+ Mercury.lightviewHandlers[@options.handler].call(@)
198
181
 
199
182
  @element.localize(Mercury.locale()) if Mercury.config.localization.enabled
200
- @element.find('.lightview-close').on('click', @hide)
201
183
  @resize()
202
184
 
203
185
 
@@ -205,18 +187,15 @@ class @Mercury.Lightview
205
187
  @titleElement.find('span').html(Mercury.I18n(@options.title))
206
188
 
207
189
 
208
- serializeForm: ->
209
- return @element.find('form').serializeObject() || {}
210
-
211
-
212
190
  reset: ->
213
191
  @titleElement.find('span').html('')
214
192
  @contentElement.html('')
215
193
 
216
194
 
217
- hide: =>
195
+ hide: ->
218
196
  return if @showing
219
197
  @options = {}
198
+ @initialized = false
220
199
 
221
200
  Mercury.trigger('focus:frame')
222
201
  @element.hide()
@@ -74,8 +74,6 @@ Mercury.I18n['de'] =
74
74
  "Mercury.PageEditor failed to load: %s\n\nPlease try refreshing.": "Mercury.PageEditor konnte nicht geladen werden: %s\n\nBitte versuche die Seite neu zu laden."
75
75
  "Region type is malformed, no data-type provided, or \"%s\" is unknown for the \"%s\" region.": "Regionstyp ist ungültig, kein Datentyp angegeben, oder \"%s\" ist unbekannt für die \"%s\"-Region."
76
76
  "Mercury was unable to save to the url: %s": "Mercury war nicht in der Lage unter der URL zu speichern: %s"
77
- "invalid": "ungültig"
78
- "can't be blank": "darf nicht leer sein"
79
77
  # Confirmations
80
78
  "You have unsaved changes. Are you sure you want to leave without saving them first?": "Es gibt ungespeicherte Änderungen. Möchtest du wirklich beenden, ohne die Änderungen vorher zu speichern?"
81
79
 
@@ -112,6 +110,10 @@ Mercury.I18n['de'] =
112
110
  "Size: %s": "Größe: %s"
113
111
  "Type: %s": "Typ: %s"
114
112
 
113
+ # Inserting Media
114
+ "Error: The provided youtube share url was invalid.": "Fehler: Die angegebene YouTube Share-URL war ungültig."
115
+ "Error: The provided vimeo url was invalid.": "Fehler: Die angegebene Vimeo-URL war ungültig."
116
+
115
117
  # Statusbar
116
118
  "Path:": "Pfad"
117
119
 
@@ -134,11 +136,12 @@ Mercury.I18n['de'] =
134
136
  "Popup Window (javascript new window popup)": "Popupfenster"
135
137
  "Popup Width": "Popup-Breite"
136
138
  "Popup Height": "Popup-Höhe"
139
+ "Insert Link": "Link einfügen"
137
140
 
138
141
  # Insert Media Modal (media.html)
139
142
  "Images": "Bilder"
140
143
  "Videos": "Videos"
141
- "YouTube URL": "YouTube-URL"
144
+ "YouTube Share URL": "YouTube Share-URL"
142
145
  "Vimeo URL": "Vimeo-URL"
143
146
  "Alignment": "Ausrichtung"
144
147
  "None": "Normal"
@@ -161,8 +164,11 @@ Mercury.I18n['de'] =
161
164
  "Columns": "Spalten"
162
165
  "Row Span": "Reihenabstand"
163
166
  "Column Span": "Spaltenabstand"
167
+ "Options": "Optionen"
168
+ "Alignment": "Ausrichtung"
164
169
  "Border": "Rahmen"
165
170
  "Spacing": "Zwischenraum"
171
+ "Insert Table": "Tabelle einfügen"
166
172
 
167
173
  # HTML Editor Modal (htmleditor.html)
168
174
  "HTML Editor": "HTML-Editor"
@@ -197,4 +203,4 @@ Mercury.I18n['de'] =
197
203
 
198
204
  "First Name": "Vorname"
199
205
  "Favorite Beer": "Lieblingsbier"
200
- "Insert Snippet": "Snippet einfügen"
206
+ "Insert Snippet": "Snippet einfügen"
@@ -74,8 +74,6 @@ Mercury.I18n['es'] =
74
74
  "Mercury.PageEditor failed to load: %s\n\nPlease try refreshing.": "Mercury.PageEditor no se ha podido cargar: %s\n\nPor favor intentalo de nuevo refrescando."
75
75
  "Region type is malformed, no data-type provided, or \"%s\" is unknown for the \"%s\" region.": "El tipo de Region es incorrecto, no se ha especificado un data-type , o \"%s\" es desconocido para la region \"%s\""
76
76
  "Mercury was unable to save to the url: %s": "Mercury no pudo guardar en la url: %s"
77
- "invalid": "inválido"
78
- "can't be blank": "no puede estar en blanco"
79
77
  # Confirmations
80
78
  "You have unsaved changes.Are you sure you want to leave without saving them first?": "Has hecho cambios que no han sido guardados. ¿Estás seguro de que quieres salir sin guardar estos cambios?"
81
79
 
@@ -112,6 +110,10 @@ Mercury.I18n['es'] =
112
110
  "Size: %s": "Tamaño: %s"
113
111
  "Type: %s": "Tipo: %s"
114
112
 
113
+ # Inserting Media
114
+ "Error: The provided youtube share url was invalid.": "Error: La URL de YouTube introducida no es válida"
115
+ "Error: The provided vimeo url was invalid.": "Error: La URL de Vimeo introducida no es válida"
116
+
115
117
  # Statusbar
116
118
  "Path:": "Ruta:"
117
119
 
@@ -134,11 +136,12 @@ Mercury.I18n['es'] =
134
136
  "Popup Window (javascript new window popup)": "Ventana Popup (nueva ventana popup con javascript)"
135
137
  "Popup Width": "Ancho de Popup"
136
138
  "Popup Height": "Alto de Popup"
139
+ "Insert Link": "Insertar Enlace"
137
140
 
138
141
  # Insert Media Modal (media.html)
139
142
  "Images": "Imágenes"
140
143
  "Videos": "Videos"
141
- "YouTube URL": "YouTube URL"
144
+ "YouTube Share URL": "YouTube URL"
142
145
  "Vimeo URL": "Vimeo URL"
143
146
  "Alignment": "Alineación"
144
147
  "None": "Ninguna"
@@ -161,8 +164,11 @@ Mercury.I18n['es'] =
161
164
  "Columns": "Columnas"
162
165
  "Row Span": "Unir Fila"
163
166
  "Column Span": "Unir Columna"
167
+ "Options": "Opciones"
168
+ "Alignment": "Alineación"
164
169
  "Border": "Borde"
165
170
  "Spacing": "Espaciado"
171
+ "Insert Table": "Insertar Tabla"
166
172
 
167
173
  # HTML Editor Modal (htmleditor.html)
168
174
  "HTML Editor": "Editor HTML"
@@ -74,8 +74,6 @@ Mercury.I18n['en'] =
74
74
  "Mercury.PageEditor failed to load: %s\n\nPlease try refreshing.": ""
75
75
  "Region type is malformed, no data-type provided, or \"%s\" is unknown for the \"%s\" region.": ""
76
76
  "Mercury was unable to save to the url: %s": ""
77
- "invalid": ""
78
- "can't be blank": ""
79
77
  # Confirmations
80
78
  "You have unsaved changes. Are you sure you want to leave without saving them first?": ""
81
79
 
@@ -138,11 +136,12 @@ Mercury.I18n['en'] =
138
136
  "Popup Window (javascript new window popup)": ""
139
137
  "Popup Width": ""
140
138
  "Popup Height": ""
139
+ "Insert Link": ""
141
140
 
142
141
  # Insert Media Modal (media.html)
143
142
  "Images": ""
144
143
  "Videos": ""
145
- "YouTube URL": ""
144
+ "YouTube Share URL": ""
146
145
  "Vimeo URL": ""
147
146
  "Alignment": ""
148
147
  "None": ""
@@ -165,8 +164,11 @@ Mercury.I18n['en'] =
165
164
  "Columns": ""
166
165
  "Row Span": ""
167
166
  "Column Span": ""
167
+ "Options": ""
168
+ "Alignment": ""
168
169
  "Border": ""
169
170
  "Spacing": ""
171
+ "Insert Table": ""
170
172
 
171
173
  # HTML Editor Modal (htmleditor.html)
172
174
  "HTML Editor": ""
@@ -74,8 +74,6 @@ Mercury.I18n['fr'] =
74
74
  "Mercury.PageEditor failed to load: %s\n\nPlease try refreshing.": "Mercury.PageEditor n'a pas pu démarrer: %s\n\nEssayez de rafraichir la page."
75
75
  "Region type is malformed, no data-type provided, or \"%s\" is unknown for the \"%s\" region.": "La région est mal formée, le type de donnée est manquant ou \"%s\" est inconnu pour la région \"%s\"."
76
76
  "Mercury was unable to save to the url: %s": "Mercury n'a pas pu sauvegarder sur l'URL : %s"
77
- "invalid": "invalide"
78
- "can't be blank": "ne peut pas être vide"
79
77
  # Confirmations
80
78
  "You have unsaved changes. Are you sure you want to leave without saving them first?": "Il y a des changements non sauvegardés. Etes-vous sûr de vouloir quitter sans les enregistrer ?"
81
79
 
@@ -112,6 +110,10 @@ Mercury.I18n['fr'] =
112
110
  "Size: %s": "Taille : %s"
113
111
  "Type: %s": "Type : %s"
114
112
 
113
+ # Inserting Media
114
+ "Error: The provided youtube share url was invalid.": "Erreur : l'URL Youtube indiquée est invalide."
115
+ "Error: The provided vimeo url was invalid.": "Erreur : l'URL Vimeo indiquée est invalide."
116
+
115
117
  # Statusbar
116
118
  "Path:": "Chemin :"
117
119
 
@@ -134,11 +136,12 @@ Mercury.I18n['fr'] =
134
136
  "Popup Window (javascript new window popup)": "Popup (nouvelle fenêtre javascript)"
135
137
  "Popup Width": "Largeur de la popup"
136
138
  "Popup Height": "Hauteur de la popup"
139
+ "Insert Link": "Insérer le lien"
137
140
 
138
141
  # Insert Media Modal (media.html)
139
142
  "Images": "Images"
140
143
  "Videos": "Vidéos"
141
- "YouTube URL": "URL Youtube"
144
+ "YouTube Share URL": "URL Youtube"
142
145
  "Vimeo URL": "URL Vimeo"
143
146
  "Alignment": "Alignement"
144
147
  "None": "Aucun"
@@ -161,8 +164,11 @@ Mercury.I18n['fr'] =
161
164
  "Columns": "Colonnes"
162
165
  "Row Span": "sur X lignes"
163
166
  "Column Span": "sur X colonnes"
167
+ "Options": "Options"
168
+ "Alignment": "Alignement"
164
169
  "Border": "Bordure"
165
170
  "Spacing": "Espacement"
171
+ "Insert Table": "Insérer le tableau"
166
172
 
167
173
  # HTML Editor Modal (htmleditor.html)
168
174
  "HTML Editor": "Editeur HTML"
@@ -74,8 +74,6 @@ Mercury.I18n['it'] =
74
74
  "Mercury.PageEditor failed to load: %s\n\nPlease try refreshing.": "È fallito il caricamento di Mercury.PageEditor: %s\n\nProva a ricaricare la pagina."
75
75
  "Region type is malformed, no data-type provided, or \"%s\" is unknown for the \"%s\" region.": "Il tipo di regione è malformato, data-type non è stato fornito, o \"%s\" è sconosciuto per la regione \"%s\"."
76
76
  "Mercury was unable to save to the url: %s": "Mercury non è stato in grado di salvare l'url: %s"
77
- "invalid": "non valido"
78
- "can't be blank": "non può essere vuota"
79
77
  # Confirmations
80
78
  "You have unsaved changes. Are you sure you want to leave without saving them first?": "Hai cambiamenti non salvati. Sei sicuro di voler abbandonare questa pagina senza prima salvarli?"
81
79
 
@@ -112,6 +110,10 @@ Mercury.I18n['it'] =
112
110
  "Size: %s": "Grandezza: %s"
113
111
  "Type: %s": "Tipo: %s"
114
112
 
113
+ # Inserting Media
114
+ "Error: The provided youtube share url was invalid.": "Errore: l'url della condivisione di youtube non è valido"
115
+ "Error: The provided vimeo url was invalid.": "Errore: l'url vimeo non è valido"
116
+
115
117
  # Statusbar
116
118
  "Path:": "Percorso"
117
119
 
@@ -134,11 +136,12 @@ Mercury.I18n['it'] =
134
136
  "Popup Window (javascript new window popup)": "Popup (nuova finestra attraverso javascript)"
135
137
  "Popup Width": "Altezza del popup"
136
138
  "Popup Height": "Larghezza del popup"
139
+ "Insert Link": "Inserisci link"
137
140
 
138
141
  # Insert Media Modal (media.html)
139
142
  "Images": "Immagini"
140
143
  "Videos": "Video"
141
- "YouTube URL": "URL YouTube"
144
+ "YouTube Share URL": "URL YouTube"
142
145
  "Vimeo URL": "URL Vimeo"
143
146
  "Alignment": "Allineamento"
144
147
  "None": "Nessuno"
@@ -161,8 +164,11 @@ Mercury.I18n['it'] =
161
164
  "Columns": "Colonne"
162
165
  "Row Span": "Estensione in righe"
163
166
  "Column Span": "Estensione in colonne"
167
+ "Options": "Opzioni"
168
+ "Alignment": "Allineamento"
164
169
  "Border": "Bordo"
165
170
  "Spacing": "Spaziatura"
171
+ "Insert Table": "Inserisci tabella"
166
172
 
167
173
  # HTML Editor Modal (htmleditor.html)
168
174
  "HTML Editor": "Editor HTML"
@@ -74,8 +74,6 @@ Mercury.I18n['ko'] =
74
74
  "Mercury.PageEditor failed to load: %s\n\nPlease try refreshing.": "Mercury.PageEditor 가 읽기에 실패했습니다. : %s\n\n새로고침을 해보세요."
75
75
  "Region type is malformed, no data-type provided, or \"%s\" is unknown for the \"%s\" region.": "위치 종류가 올바르지 않거나 데이터 타입이 제공되지 않았습니다. 혹은 \"%s\"가 \"%s\" 위치에 알려지지 않았습니다."
76
76
  "Mercury was unable to save to the url: %s": "머큐리는 그 경로에 저장 할 수 없습니다.: %s"
77
- "invalid": "무효"
78
- "can't be blank": "비워 둘 수 없습니다"
79
77
  # Confirmations
80
78
  "You have unsaved changes. Are you sure you want to leave without saving them first?": "저장하지 않은 변경사항이 있습니다. 저장하지 않고 이 페이지를 벗어나시겠습니까?"
81
79
 
@@ -112,6 +110,10 @@ Mercury.I18n['ko'] =
112
110
  "Size: %s": "용량: %s"
113
111
  "Type: %s": "형식: %s"
114
112
 
113
+ # Inserting Media
114
+ "Error: The provided youtube share url was invalid.": "오류 : 존재하지 않는 유투브 공유 주소입니다."
115
+ "Error: The provided vimeo url was invalid.": "오류 : 존재하지 않는 비메오 주소 입니다."
116
+
115
117
  # Statusbar
116
118
  "Path:": "경로:"
117
119
 
@@ -134,11 +136,12 @@ Mercury.I18n['ko'] =
134
136
  "Popup Window (javascript new window popup)": "팝업 창 (자바스크립트로 새 창을 띄웁니다.)"
135
137
  "Popup Width": "팝업 창 넓이"
136
138
  "Popup Height": "팝업 창 높이"
139
+ "Insert Link": "링크 추가"
137
140
 
138
141
  # Insert Media Modal (media.html)
139
142
  "Images": "그림:"
140
143
  "Videos": "영상:"
141
- "YouTube URL": "유투브 URL"
144
+ "YouTube Share URL": "유투브 공유 URL"
142
145
  "Vimeo URL": "비메오 URL"
143
146
  "Alignment": "정렬"
144
147
  "None": "정렬 안함"
@@ -161,8 +164,11 @@ Mercury.I18n['ko'] =
161
164
  "Columns": "컬럼"
162
165
  "Row Span": "열 합치기"
163
166
  "Column Span": "컬럼 합치기"
167
+ "Options": "설정"
168
+ "Alignment": "정렬"
164
169
  "Border": "외곽선"
165
170
  "Spacing": "여백"
171
+ "Insert Table": "표 추가"
166
172
 
167
173
  # HTML Editor Modal (htmleditor.html)
168
174
  "HTML Editor": "HTML 편집기"
@@ -197,4 +203,4 @@ Mercury.I18n['ko'] =
197
203
 
198
204
  "First Name": "이름"
199
205
  "Favorite Beer": "선호하는 맥주"
200
- "Insert Snippet": "글감 넣기"
206
+ "Insert Snippet": "글감 넣기"
@@ -74,8 +74,6 @@ Mercury.I18n['nl'] =
74
74
  "Mercury.PageEditor failed to load: %s\n\nPlease try refreshing.": "Mercury.PageEditor failed to load: %s\n\nPlease try refreshing."
75
75
  "Region type is malformed, no data-type provided, or \"%s\" is unknown for the \"%s\" region.": "Region type is malformed, no data-type provided, or \"%s\" is unknown for the \"%s\" region."
76
76
  "Mercury was unable to save to the url: %s": "Mercury was unable to save to the url: %s"
77
- "invalid": "ongeldig"
78
- "can't be blank": "niet leeg"
79
77
  # Confirmations
80
78
  "You have unsaved changes. Are you sure you want to leave without saving them first?": "Je hebt nog niet opgeslagen. Weet je zeker dat je de pagina wilt verlaten zonder eerst op te slaan?"
81
79
 
@@ -112,6 +110,10 @@ Mercury.I18n['nl'] =
112
110
  "Size: %s": "Grootte: %s"
113
111
  "Type: %s": "Type: %s"
114
112
 
113
+ # Inserting Media
114
+ "Error: The provided youtube share url was invalid.": "Irrur: Zee prufeeded youtube shere-a url ves infeleed."
115
+ "Error: The provided vimeo url was invalid.": "Irrur: Zee prufeeded vimeo url ves infeleed."
116
+
115
117
  # Statusbar
116
118
  "Path:": "Pad"
117
119
 
@@ -134,11 +136,12 @@ Mercury.I18n['nl'] =
134
136
  "Popup Window (javascript new window popup)": "Popup (nieuw venster door javascript)"
135
137
  "Popup Width": "Popup breedte"
136
138
  "Popup Height": "Popup hoogte"
139
+ "Insert Link": "Voeg link toe"
137
140
 
138
141
  # Insert Media Modal (media.html)
139
142
  "Images": "Afbeeldingen"
140
143
  "Videos": "Video's"
141
- "YouTube URL": "Youtube URL"
144
+ "YouTube Share URL": "Youtube deel URL"
142
145
  "Vimeo URL": "Vimeo URL"
143
146
  "Alignment": "Uitlijning"
144
147
  "None": "Geen"
@@ -161,8 +164,11 @@ Mercury.I18n['nl'] =
161
164
  "Columns": "Kolommen"
162
165
  "Row Span": "Rij breedte"
163
166
  "Column Span": "Kolom breedte"
167
+ "Options": "Opties"
168
+ "Alignment": "Uitlijning"
164
169
  "Border": "Rand"
165
170
  "Spacing": "Spacing"
171
+ "Insert Table": "Voeg tabel toe"
166
172
 
167
173
  # HTML Editor Modal (htmleditor.html)
168
174
  "HTML Editor": "HTML editor"