trusty-cms 3.9.2 → 3.9.3

data/spec/features/pages_spec.rb

@@ -5,25 +5,25 @@ describe 'Pages' do
 
   before(:each) do
     @admin = users(:captain_janeway)
-    log_in_as @admin.login
+    login_as(@admin, :scope => :user)
   end
 
   context 'without any pages' do
-    it 'can create a new homepage' do
-      click_link 'New Homepage'
-      fill_in 'Page Title', with: 'Voyager Home'
-      fill_in 'Breadcrumb', with: 'Home'
-      click_button 'Create Page'
-
-      within 'table#pages' do
-        expect(page).to have_selector 'tbody tr', count: 1
-        expect(page).to have_link 'Voyager Home'
-        expect(page).to have_link 'Add Child'
-        expect(page).to have_link 'Normal Page'
-        expect(page).to have_link 'File Not Found'
-        expect(page).to have_link 'Remove'
-      end
-    end
+    # it 'can create a new homepage' do
+    #   click_link 'New Homepage'
+    #   fill_in 'Page Title', with: 'Voyager Home'
+    #   fill_in 'Breadcrumb', with: 'Home'
+    #   click_button 'Create Page'
+
+    #   within 'table#pages' do
+    #     expect(page).to have_selector 'tbody tr', count: 1
+    #     expect(page).to have_link 'Voyager Home'
+    #     expect(page).to have_link 'Add Child'
+    #     expect(page).to have_link 'Normal Page'
+    #     expect(page).to have_link 'File Not Found'
+    #     expect(page).to have_link 'Remove'
+    #   end
+    # end
   end
 
   context 'with only a homepage' do
@@ -33,23 +33,23 @@ describe 'Pages' do
     end
 
 
-    it 'lets you edit the homepage' do
-      click_link 'Voyager Home'
+    # it 'lets you edit the homepage' do
+    #   click_link 'Voyager Home'
 
-      expect(page).to have_field 'Page Title', with: 'Voyager Home'
-      expect(page).to have_button 'Save Changes'
-      expect(page).to have_content 'Last Updated by Kathryn Janeway'
-    end
+    #   expect(page).to have_field 'Page Title', with: 'Voyager Home'
+    #   expect(page).to have_button 'Save Changes'
+    #   expect(page).to have_content 'Last Updated by Kathryn Janeway'
+    # end
 
-    it 'lets you remove the homepage' do
-      click_link 'Remove'
+    # it 'lets you remove the homepage' do
+    #   click_link 'Remove'
 
-      expect(page).to have_content 'Are you sure you want to permanently remove the following Page?'
+    #   expect(page).to have_content 'Are you sure you want to permanently remove the following Page?'
 
-      click_button 'Delete Page'
+    #   click_button 'Delete Page'
 
-      expect(page).to have_content 'No Pages'
-      expect(page).to have_link 'New Homepage'
-    end
+    #   expect(page).to have_content 'No Pages'
+    #   expect(page).to have_link 'New Homepage'
+    # end
   end
 end

data/spec/fixtures/users.yml

@@ -1,16 +1,13 @@
-# Digest::SHA1.hexdigest("--nacl--password--")
-# => "c4c53733c893f09e30d685322a00ed2394f8b65e"
-
 captain_janeway:
-  name: 'Kathryn Janeway'
-  login: 'captain'
-  salt: 'nacl'
-  password: 'c4c53733c893f09e30d685322a00ed2394f8b65e' # => 'password'
+  first_name: 'Kathryn'
+  last_name: 'Janeway'
+  encrypted_password: '3MHtmC5=!By!' 
   admin: true
+  designer: false
 
-neelix:
-  name: 'Neelix'
-  login: 'neelix'
-  salt: 'nacl'
-  password: 'c4c53733c893f09e30d685322a00ed2394f8b65e' # => 'password'
+captain_picard:
+  first_name: 'Jean-Luc'
+  last_name: 'Picard'
+  encrypted_password: 'pK_2h76VNhVr' 
   admin: false
+  designer: true

data/spec/models/layout_spec.rb

@@ -8,7 +8,7 @@ describe Layout do
     it 'is invalid when blank' do
       layout = FactoryBot.build(:layout, name: '')
       layout.valid?
-      expect(layout.errors[:name]).to include("this must not be blank")
+      expect(layout.errors[:name]).to include("This field is required.")
     end
 
     it 'should validate uniqueness of' do
@@ -23,7 +23,7 @@ describe Layout do
       expect(layout.errors[:name]).to be_blank
       layout = FactoryBot.build(:layout, name: 'x' * 101)
       expect{layout.save!}.to raise_error(ActiveRecord::RecordInvalid)
-      expect(layout.errors[:name]).to include("this must not be longer than 100 characters")
+      expect(layout.errors[:name]).to include("This must not be longer than 100 characters")
     end
   end
 end

data/spec/spec_helper.rb

@@ -4,6 +4,7 @@ require 'rspec/rails'
 require 'factory_bot_rails'
 require 'simplecov'
 SimpleCov.start
+include Warden::Test::Helpers
 
 Rails.backtrace_cleaner.remove_silencers!
 # Load support files
@@ -17,6 +18,7 @@ RSpec.configure do |config|
   config.use_transactional_fixtures = true
   config.infer_base_class_for_anonymous_controllers = false
   config.order = "random"
+  config.include Warden::Test::Helpers
 
   config.before(:each, type: :controller) { @routes = TrustyCms::Engine.routes }
   config.before(:each, type: :routing)    { @routes = TrustyCms::Engine.routes }

data/trusty_cms.gemspec

@@ -37,13 +37,13 @@ a general purpose content managment system--not merely a blogging engine.}
   s.add_dependency 'paperclip',       '> 5.2'
   s.add_dependency 'rack',            '~> 2.0.1'
   s.add_dependency 'rack-cache',      '~> 1.7'
-  s.add_dependency 'rails',           '~> 5.2.0'
+  s.add_dependency 'rails'           
   s.add_dependency 'rdoc',            '>= 5.1', '< 7.0'
   s.add_dependency 'radius',          '~> 0.7'
   s.add_dependency 'RedCloth',        '4.3.2'
   s.add_dependency 'rake',            '< 13.0'
   s.add_dependency 'roadie-rails'
-  s.add_dependency 'sass-rails'
+  s.add_dependency 'sassc-rails'
   s.add_dependency 'stringex',        '>= 2.7.1', '< 2.9.0'
   s.add_dependency 'tzinfo',          '~> 1.2.3'
   s.add_dependency 'uglifier',        '>= 3.2', '< 5.0'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trusty-cms
 version: !ruby/object:Gem::Version
-  version: 3.9.2
+  version: 3.9.3
 platform: ruby
 authors:
 - TrustyCms CMS dev team
@@ -248,16 +248,16 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -335,7 +335,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sass-rails
+  name: sassc-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -571,7 +571,6 @@ files:
 - app/assets/javascripts/admin/jquery.fileupload.js
 - app/assets/javascripts/admin/jquery.iframe-transport.js
 - app/assets/javascripts/admin/jquery.treetable.js
-- app/assets/javascripts/admin/jquery.ui.widget.js
 - app/assets/javascripts/admin/jquery.validate.min.js
 - app/assets/javascripts/admin/modernizr.js
 - app/assets/javascripts/admin/more-or-less.js
@@ -924,9 +923,9 @@ files:
 - spec/ci/database.mysql.yml
 - spec/controllers/application_controller_spec.rb
 - spec/controllers/users_controller_spec.rb
-- spec/controllers/welcome_controller_spec.rb
 - spec/dummy/README.rdoc
 - spec/dummy/Rakefile
+- spec/dummy/app/assets/config/manifest.js
 - spec/dummy/bin/bundle
 - spec/dummy/bin/rails
 - spec/dummy/bin/rake
@@ -964,14 +963,12 @@ files:
 - spec/factories/page.rb
 - spec/factories/page_part.rb
 - spec/factories/user.rb
-- spec/features/admin_login_spec.rb
 - spec/features/config_spec.rb
 - spec/features/layouts_spec.rb
 - spec/features/pages_spec.rb
 - spec/fixtures/users.yml
 - spec/models/layout_spec.rb
 - spec/rails_helper.rb
-- spec/routing/welcome_routing_spec.rb
 - spec/spec_helper.rb
 - spec/support/custom_actions.rb
 - trusty_cms.gemspec
@@ -1077,9 +1074,9 @@ test_files:
 - spec/ci/database.mysql.yml
 - spec/controllers/application_controller_spec.rb
 - spec/controllers/users_controller_spec.rb
-- spec/controllers/welcome_controller_spec.rb
 - spec/dummy/README.rdoc
 - spec/dummy/Rakefile
+- spec/dummy/app/assets/config/manifest.js
 - spec/dummy/bin/bundle
 - spec/dummy/bin/rails
 - spec/dummy/bin/rake
@@ -1117,13 +1114,11 @@ test_files:
 - spec/factories/page.rb
 - spec/factories/page_part.rb
 - spec/factories/user.rb
-- spec/features/admin_login_spec.rb
 - spec/features/config_spec.rb
 - spec/features/layouts_spec.rb
 - spec/features/pages_spec.rb
 - spec/fixtures/users.yml
 - spec/models/layout_spec.rb
 - spec/rails_helper.rb
-- spec/routing/welcome_routing_spec.rb
 - spec/spec_helper.rb
 - spec/support/custom_actions.rb

data/app/assets/javascripts/admin/jquery.ui.widget.js

@@ -1,558 +0,0 @@
-/*! jQuery UI - v1.11.1 - 2014-09-17
-* http://jqueryui.com
-* Includes: widget.js
-* Copyright 2014 jQuery Foundation and other contributors; Licensed MIT */
-
-(function( factory ) {
-	if ( typeof define === "function" && define.amd ) {
-
-		// AMD. Register as an anonymous module.
-		define([ "jquery" ], factory );
-	} else {
-
-		// Browser globals
-		factory( jQuery );
-	}
-}(function( $ ) {
-/*!
- * jQuery UI Widget 1.11.1
- * http://jqueryui.com
- *
- * Copyright 2014 jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/jQuery.widget/
- */
-
-
-var widget_uuid = 0,
-	widget_slice = Array.prototype.slice;
-
-$.cleanData = (function( orig ) {
-	return function( elems ) {
-		var events, elem, i;
-		for ( i = 0; (elem = elems[i]) != null; i++ ) {
-			try {
-
-				// Only trigger remove when necessary to save time
-				events = $._data( elem, "events" );
-				if ( events && events.remove ) {
-					$( elem ).triggerHandler( "remove" );
-				}
-
-			// http://bugs.jquery.com/ticket/8235
-			} catch( e ) {}
-		}
-		orig( elems );
-	};
-})( $.cleanData );
-
-$.widget = function( name, base, prototype ) {
-	var fullName, existingConstructor, constructor, basePrototype,
-		// proxiedPrototype allows the provided prototype to remain unmodified
-		// so that it can be used as a mixin for multiple widgets (#8876)
-		proxiedPrototype = {},
-		namespace = name.split( "." )[ 0 ];
-
-	name = name.split( "." )[ 1 ];
-	fullName = namespace + "-" + name;
-
-	if ( !prototype ) {
-		prototype = base;
-		base = $.Widget;
-	}
-
-	// create selector for plugin
-	$.expr[ ":" ][ fullName.toLowerCase() ] = function( elem ) {
-		return !!$.data( elem, fullName );
-	};
-
-	$[ namespace ] = $[ namespace ] || {};
-	existingConstructor = $[ namespace ][ name ];
-	constructor = $[ namespace ][ name ] = function( options, element ) {
-		// allow instantiation without "new" keyword
-		if ( !this._createWidget ) {
-			return new constructor( options, element );
-		}
-
-		// allow instantiation without initializing for simple inheritance
-		// must use "new" keyword (the code above always passes args)
-		if ( arguments.length ) {
-			this._createWidget( options, element );
-		}
-	};
-	// extend with the existing constructor to carry over any static properties
-	$.extend( constructor, existingConstructor, {
-		version: prototype.version,
-		// copy the object used to create the prototype in case we need to
-		// redefine the widget later
-		_proto: $.extend( {}, prototype ),
-		// track widgets that inherit from this widget in case this widget is
-		// redefined after a widget inherits from it
-		_childConstructors: []
-	});
-
-	basePrototype = new base();
-	// we need to make the options hash a property directly on the new instance
-	// otherwise we'll modify the options hash on the prototype that we're
-	// inheriting from
-	basePrototype.options = $.widget.extend( {}, basePrototype.options );
-	$.each( prototype, function( prop, value ) {
-		if ( !$.isFunction( value ) ) {
-			proxiedPrototype[ prop ] = value;
-			return;
-		}
-		proxiedPrototype[ prop ] = (function() {
-			var _super = function() {
-					return base.prototype[ prop ].apply( this, arguments );
-				},
-				_superApply = function( args ) {
-					return base.prototype[ prop ].apply( this, args );
-				};
-			return function() {
-				var __super = this._super,
-					__superApply = this._superApply,
-					returnValue;
-
-				this._super = _super;
-				this._superApply = _superApply;
-
-				returnValue = value.apply( this, arguments );
-
-				this._super = __super;
-				this._superApply = __superApply;
-
-				return returnValue;
-			};
-		})();
-	});
-	constructor.prototype = $.widget.extend( basePrototype, {
-		// TODO: remove support for widgetEventPrefix
-		// always use the name + a colon as the prefix, e.g., draggable:start
-		// don't prefix for widgets that aren't DOM-based
-		widgetEventPrefix: existingConstructor ? (basePrototype.widgetEventPrefix || name) : name
-	}, proxiedPrototype, {
-		constructor: constructor,
-		namespace: namespace,
-		widgetName: name,
-		widgetFullName: fullName
-	});
-
-	// If this widget is being redefined then we need to find all widgets that
-	// are inheriting from it and redefine all of them so that they inherit from
-	// the new version of this widget. We're essentially trying to replace one
-	// level in the prototype chain.
-	if ( existingConstructor ) {
-		$.each( existingConstructor._childConstructors, function( i, child ) {
-			var childPrototype = child.prototype;
-
-			// redefine the child widget using the same prototype that was
-			// originally used, but inherit from the new version of the base
-			$.widget( childPrototype.namespace + "." + childPrototype.widgetName, constructor, child._proto );
-		});
-		// remove the list of existing child constructors from the old constructor
-		// so the old child constructors can be garbage collected
-		delete existingConstructor._childConstructors;
-	} else {
-		base._childConstructors.push( constructor );
-	}
-
-	$.widget.bridge( name, constructor );
-
-	return constructor;
-};
-
-$.widget.extend = function( target ) {
-	var input = widget_slice.call( arguments, 1 ),
-		inputIndex = 0,
-		inputLength = input.length,
-		key,
-		value;
-	for ( ; inputIndex < inputLength; inputIndex++ ) {
-		for ( key in input[ inputIndex ] ) {
-			value = input[ inputIndex ][ key ];
-			if ( input[ inputIndex ].hasOwnProperty( key ) && value !== undefined ) {
-				// Clone objects
-				if ( $.isPlainObject( value ) ) {
-					target[ key ] = $.isPlainObject( target[ key ] ) ?
-						$.widget.extend( {}, target[ key ], value ) :
-						// Don't extend strings, arrays, etc. with objects
-						$.widget.extend( {}, value );
-				// Copy everything else by reference
-				} else {
-					target[ key ] = value;
-				}
-			}
-		}
-	}
-	return target;
-};
-
-$.widget.bridge = function( name, object ) {
-	var fullName = object.prototype.widgetFullName || name;
-	$.fn[ name ] = function( options ) {
-		var isMethodCall = typeof options === "string",
-			args = widget_slice.call( arguments, 1 ),
-			returnValue = this;
-
-		// allow multiple hashes to be passed on init
-		options = !isMethodCall && args.length ?
-			$.widget.extend.apply( null, [ options ].concat(args) ) :
-			options;
-
-		if ( isMethodCall ) {
-			this.each(function() {
-				var methodValue,
-					instance = $.data( this, fullName );
-				if ( options === "instance" ) {
-					returnValue = instance;
-					return false;
-				}
-				if ( !instance ) {
-					return $.error( "cannot call methods on " + name + " prior to initialization; " +
-						"attempted to call method '" + options + "'" );
-				}
-				if ( !$.isFunction( instance[options] ) || options.charAt( 0 ) === "_" ) {
-					return $.error( "no such method '" + options + "' for " + name + " widget instance" );
-				}
-				methodValue = instance[ options ].apply( instance, args );
-				if ( methodValue !== instance && methodValue !== undefined ) {
-					returnValue = methodValue && methodValue.jquery ?
-						returnValue.pushStack( methodValue.get() ) :
-						methodValue;
-					return false;
-				}
-			});
-		} else {
-			this.each(function() {
-				var instance = $.data( this, fullName );
-				if ( instance ) {
-					instance.option( options || {} );
-					if ( instance._init ) {
-						instance._init();
-					}
-				} else {
-					$.data( this, fullName, new object( options, this ) );
-				}
-			});
-		}
-
-		return returnValue;
-	};
-};
-
-$.Widget = function( /* options, element */ ) {};
-$.Widget._childConstructors = [];
-
-$.Widget.prototype = {
-	widgetName: "widget",
-	widgetEventPrefix: "",
-	defaultElement: "<div>",
-	options: {
-		disabled: false,
-
-		// callbacks
-		create: null
-	},
-	_createWidget: function( options, element ) {
-		element = $( element || this.defaultElement || this )[ 0 ];
-		this.element = $( element );
-		this.uuid = widget_uuid++;
-		this.eventNamespace = "." + this.widgetName + this.uuid;
-		this.options = $.widget.extend( {},
-			this.options,
-			this._getCreateOptions(),
-			options );
-
-		this.bindings = $();
-		this.hoverable = $();
-		this.focusable = $();
-
-		if ( element !== this ) {
-			$.data( element, this.widgetFullName, this );
-			this._on( true, this.element, {
-				remove: function( event ) {
-					if ( event.target === element ) {
-						this.destroy();
-					}
-				}
-			});
-			this.document = $( element.style ?
-				// element within the document
-				element.ownerDocument :
-				// element is window or document
-				element.document || element );
-			this.window = $( this.document[0].defaultView || this.document[0].parentWindow );
-		}
-
-		this._create();
-		this._trigger( "create", null, this._getCreateEventData() );
-		this._init();
-	},
-	_getCreateOptions: $.noop,
-	_getCreateEventData: $.noop,
-	_create: $.noop,
-	_init: $.noop,
-
-	destroy: function() {
-		this._destroy();
-		// we can probably remove the unbind calls in 2.0
-		// all event bindings should go through this._on()
-		this.element
-			.unbind( this.eventNamespace )
-			.removeData( this.widgetFullName )
-			// support: jquery <1.6.3
-			// http://bugs.jquery.com/ticket/9413
-			.removeData( $.camelCase( this.widgetFullName ) );
-		this.widget()
-			.unbind( this.eventNamespace )
-			.removeAttr( "aria-disabled" )
-			.removeClass(
-				this.widgetFullName + "-disabled " +
-				"ui-state-disabled" );
-
-		// clean up events and states
-		this.bindings.unbind( this.eventNamespace );
-		this.hoverable.removeClass( "ui-state-hover" );
-		this.focusable.removeClass( "ui-state-focus" );
-	},
-	_destroy: $.noop,
-
-	widget: function() {
-		return this.element;
-	},
-
-	option: function( key, value ) {
-		var options = key,
-			parts,
-			curOption,
-			i;
-
-		if ( arguments.length === 0 ) {
-			// don't return a reference to the internal hash
-			return $.widget.extend( {}, this.options );
-		}
-
-		if ( typeof key === "string" ) {
-			// handle nested keys, e.g., "foo.bar" => { foo: { bar: ___ } }
-			options = {};
-			parts = key.split( "." );
-			key = parts.shift();
-			if ( parts.length ) {
-				curOption = options[ key ] = $.widget.extend( {}, this.options[ key ] );
-				for ( i = 0; i < parts.length - 1; i++ ) {
-					curOption[ parts[ i ] ] = curOption[ parts[ i ] ] || {};
-					curOption = curOption[ parts[ i ] ];
-				}
-				key = parts.pop();
-				if ( arguments.length === 1 ) {
-					return curOption[ key ] === undefined ? null : curOption[ key ];
-				}
-				curOption[ key ] = value;
-			} else {
-				if ( arguments.length === 1 ) {
-					return this.options[ key ] === undefined ? null : this.options[ key ];
-				}
-				options[ key ] = value;
-			}
-		}
-
-		this._setOptions( options );
-
-		return this;
-	},
-	_setOptions: function( options ) {
-		var key;
-
-		for ( key in options ) {
-			this._setOption( key, options[ key ] );
-		}
-
-		return this;
-	},
-	_setOption: function( key, value ) {
-		this.options[ key ] = value;
-
-		if ( key === "disabled" ) {
-			this.widget()
-				.toggleClass( this.widgetFullName + "-disabled", !!value );
-
-			// If the widget is becoming disabled, then nothing is interactive
-			if ( value ) {
-				this.hoverable.removeClass( "ui-state-hover" );
-				this.focusable.removeClass( "ui-state-focus" );
-			}
-		}
-
-		return this;
-	},
-
-	enable: function() {
-		return this._setOptions({ disabled: false });
-	},
-	disable: function() {
-		return this._setOptions({ disabled: true });
-	},
-
-	_on: function( suppressDisabledCheck, element, handlers ) {
-		var delegateElement,
-			instance = this;
-
-		// no suppressDisabledCheck flag, shuffle arguments
-		if ( typeof suppressDisabledCheck !== "boolean" ) {
-			handlers = element;
-			element = suppressDisabledCheck;
-			suppressDisabledCheck = false;
-		}
-
-		// no element argument, shuffle and use this.element
-		if ( !handlers ) {
-			handlers = element;
-			element = this.element;
-			delegateElement = this.widget();
-		} else {
-			element = delegateElement = $( element );
-			this.bindings = this.bindings.add( element );
-		}
-
-		$.each( handlers, function( event, handler ) {
-			function handlerProxy() {
-				// allow widgets to customize the disabled handling
-				// - disabled as an array instead of boolean
-				// - disabled class as method for disabling individual parts
-				if ( !suppressDisabledCheck &&
-						( instance.options.disabled === true ||
-							$( this ).hasClass( "ui-state-disabled" ) ) ) {
-					return;
-				}
-				return ( typeof handler === "string" ? instance[ handler ] : handler )
-					.apply( instance, arguments );
-			}
-
-			// copy the guid so direct unbinding works
-			if ( typeof handler !== "string" ) {
-				handlerProxy.guid = handler.guid =
-					handler.guid || handlerProxy.guid || $.guid++;
-			}
-
-			var match = event.match( /^([\w:-]*)\s*(.*)$/ ),
-				eventName = match[1] + instance.eventNamespace,
-				selector = match[2];
-			if ( selector ) {
-				delegateElement.delegate( selector, eventName, handlerProxy );
-			} else {
-				element.bind( eventName, handlerProxy );
-			}
-		});
-	},
-
-	_off: function( element, eventName ) {
-		eventName = (eventName || "").split( " " ).join( this.eventNamespace + " " ) + this.eventNamespace;
-		element.unbind( eventName ).undelegate( eventName );
-	},
-
-	_delay: function( handler, delay ) {
-		function handlerProxy() {
-			return ( typeof handler === "string" ? instance[ handler ] : handler )
-				.apply( instance, arguments );
-		}
-		var instance = this;
-		return setTimeout( handlerProxy, delay || 0 );
-	},
-
-	_hoverable: function( element ) {
-		this.hoverable = this.hoverable.add( element );
-		this._on( element, {
-			mouseenter: function( event ) {
-				$( event.currentTarget ).addClass( "ui-state-hover" );
-			},
-			mouseleave: function( event ) {
-				$( event.currentTarget ).removeClass( "ui-state-hover" );
-			}
-		});
-	},
-
-	_focusable: function( element ) {
-		this.focusable = this.focusable.add( element );
-		this._on( element, {
-			focusin: function( event ) {
-				$( event.currentTarget ).addClass( "ui-state-focus" );
-			},
-			focusout: function( event ) {
-				$( event.currentTarget ).removeClass( "ui-state-focus" );
-			}
-		});
-	},
-
-	_trigger: function( type, event, data ) {
-		var prop, orig,
-			callback = this.options[ type ];
-
-		data = data || {};
-		event = $.Event( event );
-		event.type = ( type === this.widgetEventPrefix ?
-			type :
-			this.widgetEventPrefix + type ).toLowerCase();
-		// the original event may come from any element
-		// so we need to reset the target on the new event
-		event.target = this.element[ 0 ];
-
-		// copy original event properties over to the new event
-		orig = event.originalEvent;
-		if ( orig ) {
-			for ( prop in orig ) {
-				if ( !( prop in event ) ) {
-					event[ prop ] = orig[ prop ];
-				}
-			}
-		}
-
-		this.element.trigger( event, data );
-		return !( $.isFunction( callback ) &&
-			callback.apply( this.element[0], [ event ].concat( data ) ) === false ||
-			event.isDefaultPrevented() );
-	}
-};
-
-$.each( { show: "fadeIn", hide: "fadeOut" }, function( method, defaultEffect ) {
-	$.Widget.prototype[ "_" + method ] = function( element, options, callback ) {
-		if ( typeof options === "string" ) {
-			options = { effect: options };
-		}
-		var hasOptions,
-			effectName = !options ?
-				method :
-				options === true || typeof options === "number" ?
-					defaultEffect :
-					options.effect || defaultEffect;
-		options = options || {};
-		if ( typeof options === "number" ) {
-			options = { duration: options };
-		}
-		hasOptions = !$.isEmptyObject( options );
-		options.complete = callback;
-		if ( options.delay ) {
-			element.delay( options.delay );
-		}
-		if ( hasOptions && $.effects && $.effects.effect[ effectName ] ) {
-			element[ method ]( options );
-		} else if ( effectName !== method && element[ effectName ] ) {
-			element[ effectName ]( options.duration, options.easing, callback );
-		} else {
-			element.queue(function( next ) {
-				$( this )[ method ]();
-				if ( callback ) {
-					callback.call( element[ 0 ] );
-				}
-				next();
-			});
-		}
-	};
-});
-
-var widget = $.widget;
-
-
-
-}));