tb_core 0.9.18 → 0.9.19

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzU2Mzg1MWRiNGM0YTY2NjA0MDEwZDNhMzQ3NjY1OWViMWYwYzc4OA==
+    ZGUxM2I3ZjAyNmY2OTRhNGUyNThjNjFlYmYxZmNjNjQxYmVmNmZjNQ==
   data.tar.gz: !binary |-
-    MzRkY2M5NjY0MTAzMGZlOTI1MTlhMDMxMmJlMDc0YTgxZWM1MWFmZQ==
+    ZGRhYTU0OGExYWFkNjI2ZDNiOThiN2RmMWYwNGM4NmMwNTllOTYwZg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZDc2ZDNjOTcyNzU1YTU0NDI5YzZlZGI2NzRjOTAzMDljYzI1ZWEwYTRkODM0
-    YmQyNzRjOTRmZGNiZTY5Mjc0ZDI3OTY0OTMyZWM4MDEzMTIxMjJmMjgzZDVi
-    OTY3MTk1ZWMzYzczOTllNTEwNDZlMmQ0Yzg1YmE1MWRkNjk2ZTk=
+    ZTNmNGZjMzFmNTk1ZThmZmRjZGFjNDVlYTViNzJjYTYwZTFiZjE3MWE2NWMy
+    OWQ3ZDhiNjY0MWFmYzM5YWE4YzBjNDZiYWMxNzhjNDA3ZGQ3NGZlZWZhM2Nm
+    OWVjZDFkNzM2NTlhODdmMzk0YmE4OGEyOGU2M2VmNWU2NTdhNTU=
   data.tar.gz: !binary |-
-    MjQ2Y2FiYzhlMGEzOGJhZGFiZGM4MDY3YTJjYzViM2MwOTM4ZjlhNmQ2ZTMz
-    OWQ1NDdhZWFmMDFhYWI4MmVhNTYwZDgyZDI0NDRjOWQ5YzZmNzAyNDVlZTQw
-    ZDBmYjdjZjBkY2JhNjAyM2U3NjI3OGMxNjdhM2Y5Yjg1OGE4NzU=
+    OGFiNDQzNzBiZmI0NDlmZTcyMDk2OTlmZjAyNDg4NTMyNjU4OWM3ZGIxNTBm
+    NDg2YmZhYTI1NWQ5ZDI4OWU0NjVhYjRmZjQ5MWQxM2QzNTIwM2E0YTJhNmE3
+    NmM2OGQzOGQwMzViOWM3MmZiZDNlOGZkODhkMmI3MDgxMDgwNTE=

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

@@ -18,6 +18,7 @@ spud.admin.editor = {};
     []
   ];
 
+
   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|" +
@@ -44,7 +45,6 @@ spud.admin.editor = {};
 
   var validFormats = "p,h1,h2,h3,h4,h5,h6";
 
-
   editor.init = function(options) {
     editor.monitorFormatters();
     options = options || {};
@@ -59,9 +59,7 @@ spud.admin.editor = {};
         case 'HTML':
         default:
           editor.initMCEWithOptions(this, options || {});
-      };
-
-
+      }
     });
 
   };
@@ -82,37 +80,47 @@ spud.admin.editor = {};
 
     var theme = options.theme || 'advanced';
     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;
+    }
 
     $(element).tinymce({
-    theme: theme,
-    plugins: registeredPlugins.join(','),
-    theme_advanced_toolbar_location: "top",
-    theme_advanced_buttons1: registeredButtons[0].join(','),
-    theme_advanced_buttons2: registeredButtons[1].join(','),
-    theme_advanced_buttons3: registeredButtons[2].join(','),
-    theme_advanced_buttons4: registeredButtons[3].join(','),
-    theme_advanced_toolbar_align: 'left',
-    theme_advanced_blockformats: validFormats,
-    convert_urls: false,
-    valid_elements: validElements,
-    media_strict: false,
-    extended_valid_elements: extendedValidElements.join(","),
-    width: $(element).width(),
-    height: height
+      theme: theme,
+      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,
+      convert_urls: false,
+      valid_elements: validElements,
+      media_strict: false,
+      extended_valid_elements: extendedValidElements.join(","),
+      width: width,
+      height: height
     });
-
-
   };
 
   var codeMirrors = [];
   editor.initCodeMirrorWithOptions = function(element, format, options) {
     var editor = CodeMirror.fromTextArea(element, {
-        mode: 'markdown',
-        lineNumbers: true,
-        lineWrapping: true,
-        theme: "default",
-        extraKeys: {"Enter": "newlineAndIndentContinueMarkdownList"}
-      });
+      mode: 'markdown',
+      lineNumbers: true,
+      lineWrapping: true,
+      theme: "default",
+      extraKeys: {"Enter": "newlineAndIndentContinueMarkdownList"}
+    });
     codeMirrors.push(editor);
 
     $(element).attr('code-mirror-id',codeMirrors.length-1);
@@ -132,8 +140,6 @@ spud.admin.editor = {};
 
   };
 
-
-
   editor.registerPlugin = function(pluginName){
     if($.inArray(registeredPlugins, pluginName) < 0){
       registeredPlugins.push(pluginName);

data/app/assets/stylesheets/spud/admin/application.css

@@ -246,7 +246,7 @@ div.field_with_errors {
 }
 div.field_with_errors label {
     color:#F00;
-    background: url(/images/icons/error.png) top left no-repeat;
+    /*background: url(/images/icons/error.png) top left no-repeat;*/
 }
 
 

data/app/assets/stylesheets/spud/forms.css

@@ -103,6 +103,6 @@ div.field_with_errors {
 }
 div.field_with_errors label {
     color:#F00;
-    background: url(/images/icons/error.png) top left no-repeat;
+    /*background: url(/images/icons/error.png) top left no-repeat;*/
 }
 .formtab_buttons li {}

data/lib/responds_to_parent.rb

@@ -0,0 +1,69 @@
+#  Copyright (c) 2006 Sean Treadway
+#
+#  Permission is hereby granted, free of charge, to any person obtaining
+#  a copy of this software and associated documentation files (the
+#  "Software"), to deal in the Software without restriction, including
+#  without limitation the rights to use, copy, modify, merge, publish,
+#  distribute, sublicense, and/or sell copies of the Software, and to
+#  permit persons to whom the Software is furnished to do so, subject to
+#  the following conditions:
+#
+#  The above copyright notice and this permission notice shall be
+#  included in all copies or substantial portions of the Software.
+#
+#  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+#  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+#  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+#  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+#  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+#  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+#  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+# Module containing the methods useful for child IFRAME to parent window communication
+module RespondsToParent
+
+  # Executes the response body as JavaScript in the context of the parent window.
+  # Use this method of you are posting a form to a hidden IFRAME or if you would like
+  # to use IFRAME base RPC.
+  def responds_to_parent(&block)
+    yield
+
+    if performed?
+      # We're returning HTML instead of JS or XML now
+      response.headers['Content-Type'] = 'text/html; charset=UTF-8'
+
+      # Either pull out a redirect or the request body
+      script =  if response.headers['Location']
+                  #TODO: erase_redirect_results is missing in rails 3.0 has to be implemented
+#                  erase redirect
+                  "document.location.href = #{location.to_s.inspect}"
+                else
+                  response.body
+                end
+
+      # Escape quotes, linebreaks and slashes, maintaining previously escaped slashes
+      # Suggestions for improvement?
+      script = (script || '').
+        gsub('\\', '\\\\\\').
+        gsub(/\r\n|\r|\n/, '\\n').
+        gsub(/['"]/, '\\\\\&').
+        gsub('</script>','</scr"+"ipt>')
+
+      # Clear out the previous render to prevent double render
+      response.request.env['action_controller.instance'].instance_variable_set(:@_response_body, nil)
+
+      # Eval in parent scope and replace document location of this frame
+      # so back button doesn't replay action on targeted forms
+      # loc = document.location to be set after parent is updated for IE
+      # with(window.parent) - pull in variables from parent window
+      # setTimeout - scope the execution in the windows parent for safari
+      # window.eval - legal eval for Opera
+      render :text => "<html><body><script type='text/javascript' charset='utf-8'>
+        var loc = document.location;
+        with(window.parent) { setTimeout(function() { window.eval('#{script}'); if (typeof(loc) !== 'undefined') loc.replace('about:blank'); }, 1) };
+        </script></body></html>".html_safe
+    end
+  end
+  alias respond_to_parent responds_to_parent
+end

data/lib/spud_core/engine.rb

@@ -15,6 +15,7 @@ module Spud
     class Engine < ::Rails::Engine
       require "#{root}/lib/spud_core/belongs_to_app"
       require "#{root}/lib/spud_core/searchable"
+      require "#{root}/lib/responds_to_parent"
 
       def self.require_model(model_name)
         require "#{root}/app/models/#{model_name}"

data/lib/spud_core/version.rb

@@ -1,5 +1,5 @@
 module Spud
 	module Core
-	  VERSION = "0.9.18"
+	  VERSION = "0.9.19"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tb_core
 version: !ruby/object:Gem::Version
-  version: 0.9.18
+  version: 0.9.19
 platform: ruby
 authors:
 - Greg Woods
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-13 00:00:00.000000000 Z
+date: 2013-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -489,6 +489,7 @@ files:
 - db/migrate/20120327124229_add_time_zone_to_spud_user.rb
 - db/migrate/20120328235431_add_scope_to_spud_admin_permissions.rb
 - db/migrate/20120329174000_create_spud_user_settings.rb
+- lib/responds_to_parent.rb
 - lib/spud_core/belongs_to_app.rb
 - lib/spud_core/configuration.rb
 - lib/spud_core/engine.rb