diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 0d5b962c1..d07c64fb1 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -133,6 +133,6 @@ $(function(){ Turbolinks.enableProgressBar(); $(document).ready(initialize_modules); - $(document).on('page:load', initialize_modules); - $(document).on('ajax:complete', initialize_modules); + $(document).on("page:load", initialize_modules); + $(document).on("ajax:complete", initialize_modules); }); diff --git a/app/assets/javascripts/ckeditor/config.js b/app/assets/javascripts/ckeditor/config.js index 631cad7d7..04539f94e 100644 --- a/app/assets/javascripts/ckeditor/config.js +++ b/app/assets/javascripts/ckeditor/config.js @@ -19,7 +19,7 @@ CKEDITOR.editorConfig = function( config ) // Rails CSRF token config.filebrowserParams = function(){ var csrf_token, csrf_param, meta, - metas = document.getElementsByTagName('meta'), + metas = document.getElementsByTagName("meta"), params = new Object(); for ( var i = 0 ; i < metas.length ; i++ ){ @@ -58,47 +58,47 @@ CKEDITOR.editorConfig = function( config ) }; // Integrate Rails CSRF token into file upload dialogs (link, image, attachment and flash) - CKEDITOR.on( 'dialogDefinition', function( ev ){ + CKEDITOR.on( "dialogDefinition", function( ev ){ // Take the dialog name and its definition from the event data. var dialogName = ev.data.name; var dialogDefinition = ev.data.definition; var content, upload; - if (CKEDITOR.tools.indexOf(['link', 'image', 'attachment', 'flash'], dialogName) > -1) { - content = (dialogDefinition.getContents('Upload') || dialogDefinition.getContents('upload')); - upload = (content == null ? null : content.get('upload')); + if (CKEDITOR.tools.indexOf(["link", "image", "attachment", "flash"], dialogName) > -1) { + content = (dialogDefinition.getContents("Upload") || dialogDefinition.getContents("upload")); + upload = (content == null ? null : content.get("upload")); - if (upload && upload.filebrowser && upload.filebrowser['params'] === undefined) { - upload.filebrowser['params'] = config.filebrowserParams(); - upload.action = config.addQueryString(upload.action, upload.filebrowser['params']); + if (upload && upload.filebrowser && upload.filebrowser["params"] === undefined) { + upload.filebrowser["params"] = config.filebrowserParams(); + upload.action = config.addQueryString(upload.action, upload.filebrowser["params"]); } } }); // Toolbar groups configuration. config.toolbar = [ - { name: 'document', groups: [ 'mode', 'document', 'doctools' ], items: [ 'Source'] }, - { name: 'clipboard', groups: [ 'clipboard', 'undo' ], items: [ 'Cut', 'Copy', 'Paste', 'PasteText', 'PasteFromWord', '-', 'Undo', 'Redo' ] }, - // { name: 'editing', groups: [ 'find', 'selection', 'spellchecker' ], items: [ 'Find', 'Replace', '-', 'SelectAll', '-', 'Scayt' ] }, - // { name: 'forms', items: [ 'Form', 'Checkbox', 'Radio', 'TextField', 'Textarea', 'Select', 'Button', 'ImageButton', 'HiddenField' ] }, - { name: 'links', items: [ 'Link', 'Unlink', 'Anchor' ] }, - { name: 'insert', items: [ 'Image', 'Flash', 'Table', 'HorizontalRule', 'SpecialChar' ] }, - { name: 'paragraph', groups: [ 'list', 'indent', 'blocks', 'align', 'bidi' ], items: [ 'NumberedList', 'BulletedList', '-', 'Outdent', 'Indent', '-', 'Blockquote', 'CreateDiv', '-', 'JustifyLeft', 'JustifyCenter', 'JustifyRight', 'JustifyBlock' ] }, - '/', - { name: 'styles', items: [ 'Styles', 'Format', 'Font', 'FontSize' ] }, - { name: 'colors', items: [ 'TextColor', 'BGColor' ] }, - { name: 'basicstyles', groups: [ 'basicstyles', 'cleanup' ], items: [ 'Bold', 'Italic', 'Underline', 'Strike', 'Subscript', 'Superscript', '-', 'RemoveFormat' ] } + { name: "document", groups: [ "mode", "document", "doctools" ], items: [ "Source"] }, + { name: "clipboard", groups: [ "clipboard", "undo" ], items: [ "Cut", "Copy", "Paste", "PasteText", "PasteFromWord", "-", "Undo", "Redo" ] }, + // { name: "editing", groups: [ "find", "selection", "spellchecker" ], items: [ "Find", "Replace", "-", "SelectAll", "-", "Scayt" ] }, + // { name: "forms", items: [ "Form", "Checkbox", "Radio", "TextField", "Textarea", "Select", "Button", "ImageButton", "HiddenField" ] }, + { name: "links", items: [ "Link", "Unlink", "Anchor" ] }, + { name: "insert", items: [ "Image", "Flash", "Table", "HorizontalRule", "SpecialChar" ] }, + { name: "paragraph", groups: [ "list", "indent", "blocks", "align", "bidi" ], items: [ "NumberedList", "BulletedList", "-", "Outdent", "Indent", "-", "Blockquote", "CreateDiv", "-", "JustifyLeft", "JustifyCenter", "JustifyRight", "JustifyBlock" ] }, + "/", + { name: "styles", items: [ "Styles", "Format", "Font", "FontSize" ] }, + { name: "colors", items: [ "TextColor", "BGColor" ] }, + { name: "basicstyles", groups: [ "basicstyles", "cleanup" ], items: [ "Bold", "Italic", "Underline", "Strike", "Subscript", "Superscript", "-", "RemoveFormat" ] } ]; config.toolbar_mini = [ - { name: 'paragraph', groups: [ 'list' ], items: [ 'NumberedList', 'BulletedList' ] }, - { name: 'links', items: [ 'Link', 'Unlink' ] }, - { name: 'styles', items: [ 'Format' ] }, - { name: 'basicstyles', groups: [ 'basicstyles', 'cleanup' ], items: [ 'Bold', 'Italic', 'Underline', 'Strike' ] } + { name: "paragraph", groups: [ "list" ], items: [ "NumberedList", "BulletedList" ] }, + { name: "links", items: [ "Link", "Unlink" ] }, + { name: "styles", items: [ "Format" ] }, + { name: "basicstyles", groups: [ "basicstyles", "cleanup" ], items: [ "Bold", "Italic", "Underline", "Strike" ] } ]; config.toolbar_admin = config.toolbar_mini.concat([ - { name: 'insert', items: [ 'Image', 'Table' ] } + { name: "insert", items: [ "Image", "Table" ] } ]); config.toolbar = "mini"; diff --git a/app/assets/javascripts/ckeditor/loader.js.erb b/app/assets/javascripts/ckeditor/loader.js.erb index 66e1d8347..a01df8811 100644 --- a/app/assets/javascripts/ckeditor/loader.js.erb +++ b/app/assets/javascripts/ckeditor/loader.js.erb @@ -1,3 +1,3 @@ //= require ckeditor/init -CKEDITOR.config.customConfig = '<%= javascript_path 'ckeditor/config.js' %>'; +CKEDITOR.config.customConfig = "<%= javascript_path 'ckeditor/config.js' %>"; diff --git a/app/assets/javascripts/ckeditor/reinit.js b/app/assets/javascripts/ckeditor/reinit.js index fe8e8cff3..7d2d4233c 100644 --- a/app/assets/javascripts/ckeditor/reinit.js +++ b/app/assets/javascripts/ckeditor/reinit.js @@ -1,7 +1,7 @@ -$(document).bind('page:change', function() { +$(document).bind("page:change", function() { if (typeof(CKEDITOR) != "undefined"){ for(name in CKEDITOR.instances){ try{CKEDITOR.replace(name);}catch(err){}; } } -}); \ No newline at end of file +}); diff --git a/app/assets/javascripts/stat_graphs.js b/app/assets/javascripts/stat_graphs.js index c5bc5b538..256078a85 100644 --- a/app/assets/javascripts/stat_graphs.js +++ b/app/assets/javascripts/stat_graphs.js @@ -9,6 +9,6 @@ var initialize_stats_modules = function() { $(function(){ $(document).ready(initialize_stats_modules); - $(document).on('page:load', initialize_stats_modules); - $(document).on('ajax:complete', initialize_stats_modules); + $(document).on("page:load", initialize_stats_modules); + $(document).on("ajax:complete", initialize_stats_modules); });