fixed jrails, fixed deprecation warnings

This commit is contained in:
albert
2010-10-27 13:40:50 -04:00
parent a9da0f1059
commit 484ff696e2
16 changed files with 119 additions and 99 deletions

View File

@@ -2,4 +2,4 @@
:patch: 0
:build:
:major: 0
:minor: 7
:minor: 8

View File

@@ -1,3 +1,5 @@
$: << File.expand_path("..", __FILE__)
require 'jrails/jrails'
require 'jrails/asset_tag_ext'
require 'jrails/jquery_selector_assertions' if Rails.env == 'test'
require 'jrails/jquery_selector_assertions' if Rails.env == 'test'

View File

@@ -1,4 +1,4 @@
class JRails
module JRails
@@config = {
:google => false,
:jquery_version => "1.4.2",

View File

@@ -1,16 +0,0 @@
# The following options can be changed by creating an initializer in config/initializers/jrails.rb
# jRails uses jQuery.noConflict() by default
# to use the default jQuery variable, use:
# ActionView::Helpers::PrototypeHelper::JQUERY_VAR = '$'
# ActionView::Helpers::PrototypeHelper:: DISABLE_JQUERY_FORGERY_PROTECTION
# Set this to disable forgery protection in ajax calls
# This is handy if you want to use caching with ajax by injecting the forgery token via another means
# for an example, see http://henrik.nyh.se/2008/05/rails-authenticity-token-with-jquery
# ActionView::Helpers::PrototypeHelper::DISABLE_JQUERY_FORGERY_PROTECTION = true
#ActionView::Helpers::AssetTagHelper::JAVASCRIPT_DEFAULT_SOURCES = ['jquery','jquery-ui','jrails']
#ActionView::Helpers::AssetTagHelper::reset_javascript_include_default
require 'jrails'
require 'jquery_selector_assertions' if Rails.env.test?