tb_core 1.2.4 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf20305470b452af36fca1e23124a676b61cdc50
-  data.tar.gz: 44b05c92f01040378720ba77e614a650f60d18d5
+  metadata.gz: 0995b70d53813ddd5e1ebbbdd6204d05bf578162
+  data.tar.gz: 540e350accfc57eb8041a07cddc45b6e2c528f95
 SHA512:
-  metadata.gz: 35dd3f7a88ac1603d596f57b60aeadb1d3e7a0a7e9e04bca110dba34d0fa48f742c87242ce6dba1a9877aca5a12adfa0c97b88ca40a844e6ca1fb530d3038219
-  data.tar.gz: 45f61b833bb35b052c952d0a612fd0019f3b113a434b01110b4428dcf6768e06bae391fb7949e6e27be9b847dee51cbf6eec371cb05dcfffa82f604f29399953
+  metadata.gz: 4c82914ae0bc2d21cf85b6f56deebfbd7f5c12b8ac5c0030085fada42db0031ecb1a5e3f39b42fa38f3ab2f7ca491b26ad43ca7e4dde1cdb6d20ba0550f705ae
+  data.tar.gz: 0cefa04341cd76b2d2c6aeafdeeebf422379e59bce09944e823a70749218a44e04bc2eb64bff1179cf314170fb8cfbeb2659a8651ead0c0cff74c4aca250d8c0

data/README.md

@@ -147,7 +147,7 @@ Create a file in your app at `app/views/admin/users/_show_additions.html.erb`.
 404 Handling
 ------------
 
-The base `Spud::ApplicationController` will automatically rescue from any `Spud::NotFoundError` errors by rendering out the `layouts/not_found.html` template. To customize this view, create a template by that name in your own project.
+The base `Spud::ApplicationController` will automatically rescue from any `Spud::NotFoundError` and `Spud::AccessDeniedError` errors by rendering out the `layouts/error_page.html` template. To customize this view, create a template by that name in your own project.
 
 When building your own apps you may raise a `Spud::NotFoundError` at any time to halt further execution and cause the 404 page to render. For example:
 

data/app/assets/javascripts/admin/core/application.js

@@ -1,10 +1,9 @@
 //= require jquery
 //= require jquery_ujs
 //= require tinymce-jquery
-//= require tinymce/plugins/tableDropdown/editor_plugin
 //= require bootstrap/js/bootstrap
 //= require datepicker/js/bootstrap-datepicker
-//= require jquery-ui/js/jquery-ui-1.9.1.custom
+//= require jquery-ui/jquery-ui
 //= require ../../tb_core
 //= require_self
 //= require_tree .

data/app/assets/javascripts/admin/core/editor.js

@@ -1,6 +1,3 @@
-//= require codemirror
-//= require codemirror/modes/markdown
-
 spud.admin.editor = {};
 
 (function(){
@@ -8,17 +5,18 @@ spud.admin.editor = {};
   var editor = spud.admin.editor;
 
   var registeredPlugins = [
-    'autolink','lists','table','tableDropdown','advhr','advimage','advlink','inlinepopups','media','paste'
+    'autolink','lists','image','link','media','paste', 'code'
   ];
 
   var registeredButtons = [
-    ['bold','italic','underline','strikethrough','|','justifyleft','justifycenter','justifyright','justifyfull','|','formatselect','cut','copy','paste', 'pasteword','pastetext','|','bullist','numlist','outdent','indent','|','tableDropdown','|','link','unlink','anchor','image','code'],
-    [],
-    [],
-    []
+    'undo', 'redo', '|',
+    'bold','italic','underline','strikethrough','|',
+    'formatselect','|',
+    'cut','copy','paste', 'pasteword','pastetext','|',
+    'bullist','numlist','outdent','indent','|',
+    'link','unlink','image', '|', 'code', '|'
   ];
 
-
   var validElements = "@[id|class|style|title|dir<ltr?rtl|lang|xml::lang|onclick|ondblclick|" +
     "onmousedown|onmouseup|onmouseover|onmousemove|onmouseout|onkeypress|" +
     "onkeydown|onkeyup],a[rel|rev|charset|hreflang|tabindex|accesskey|type|" +
@@ -43,8 +41,6 @@ spud.admin.editor = {};
 
   var extendedValidElements = [];
 
-  var validFormats = "p,h1,h2,h3,h4,h5,h6";
-
   editor.init = function(options) {
     editor.monitorFormatters();
     options = options || {};
@@ -52,14 +48,10 @@ spud.admin.editor = {};
     $(selector).each(function() {
       var $this = $(this);
       var dataFormat = $this.attr('data-format');
-      switch(dataFormat) {
-        case 'Markdown':
-          editor.initCodeMirrorWithOptions(this,'markdown', options || {});
-          break;
-        case 'HTML':
-        default:
-          editor.initMCEWithOptions(this, options || {});
+      if(dataFormat == 'Markdown'){
+        console.warn('Markdown is not supported at this time.');
       }
+      editor.initMCEWithOptions(this, options || {});
     });
 
   };
@@ -78,32 +70,18 @@ spud.admin.editor = {};
 
   editor.initMCEWithOptions = function(element, options){
 
-    var theme = options.theme || 'advanced';
+    var theme = options.theme || 'modern';
     var height = options.height || 400;
     var width = options.width || $(element).width();
-
-    var buttons = [];
-    if(options.buttons){
-      for(var i=0; i<4; i++){
-        var row = options.buttons[i] || [];
-        buttons.push(row);
-      }
-    }
-    else{
-      buttons = registeredButtons;
-    }
+    var buttons = options.buttons || registeredButtons;
+    var plugins = options.plugins || registeredPlugins;
 
     $(element).tinymce({
       theme: theme,
       language: 'en',
-      plugins: registeredPlugins.join(','),
-      theme_advanced_toolbar_location: "top",
-      theme_advanced_buttons1: buttons[0].join(','),
-      theme_advanced_buttons2: buttons[1].join(','),
-      theme_advanced_buttons3: buttons[2].join(','),
-      theme_advanced_buttons4: buttons[3].join(','),
-      theme_advanced_toolbar_align: 'left',
-      theme_advanced_blockformats: validFormats,
+      menubar: false,
+      plugins: plugins.join(' '),
+      toolbar: buttons.join(' '),
       convert_urls: false,
       valid_elements: validElements,
       media_strict: false,
@@ -113,32 +91,8 @@ spud.admin.editor = {};
     });
   };
 
-  var codeMirrors = [];
-  editor.initCodeMirrorWithOptions = function(element, format, options) {
-    var editor = CodeMirror.fromTextArea(element, {
-      mode: 'markdown',
-      lineNumbers: true,
-      lineWrapping: true,
-      theme: "default",
-      extraKeys: {"Enter": "newlineAndIndentContinueMarkdownList"}
-    });
-    codeMirrors.push(editor);
-
-    $(element).attr('code-mirror-id',codeMirrors.length-1);
-  };
-
-  editor.unload = function(selectorOptional) {
-    var selector = selectorOptional || 'textarea.tinymce';
-    $(selector).each(function() {
-      var $this = $(this);
-      if($this.attr('code-mirror-id')) {
-        codeMirrors[parseInt($this.attr('code-mirror-id'),10)].toTextArea();
-        codeMirrors[parseInt($this.attr('code-mirror-id'),10)] = null;
-        $this.removeAttr('code-mirror-id');
-      }
-        tinyMCE.execCommand('mceRemoveControl',false,this.id);
-    });
-
+  editor.unload = function() {
+    tinyMCE.remove();
   };
 
   editor.registerPlugin = function(pluginName){
@@ -163,12 +117,14 @@ spud.admin.editor = {};
   };
 
   editor.registerButton = function(buttonNameOrArray, rowNum){
-    rowNum = rowNum || 0;
+    if(rowNum){
+      console.warn('rowNum parameter is no longer used.');
+    }
     if(typeof(buttonNameOrArray) == 'object'){
-      registeredButtons[rowNum].concat(buttonNameOrArray);
+      registeredButtons.concat(buttonNameOrArray);
     }
     else{
-      registeredButtons[rowNum].push(buttonNameOrArray);
+      registeredButtons.push(buttonNameOrArray);
     }
   };
 })();