hobo_jquery_ui 1.4.0.pre8 → 2.0.0.pre1

data/VERSION

@@ -1 +1 @@
-1.4.0.pre8
+2.0.0.pre1

data/taglibs/dialog_box.dryml

@@ -6,16 +6,21 @@ The default for [autoOpen](http://jqueryui.com/demos/dialog/#option-autoOpen) ha
 The [buttons](http://jqueryui.com/demos/dialog/#option-buttons) option has been changed slightly.  Because of quoting issues, it's usually easier to assign the list to a variable and then include the list:
 
     <% buttons = [ ["cancel", "jQuery(this).dialog('close')"] ] %>
+
 or
+
     <% buttons = [ ["save", "hjq_dialog_box.submitAndClose"], ["cancel", "hjq_dialog_box.close"], ] %>
 
 with
+
     <dialog-box buttons="&buttons">My dialog text</dialog-box>
 
 Alternatively:
 
     <dialog-box id="story-dialog" buttons='&{"cancel" => "jQuery(this).dialog(\"close\")"}' >My dialog text</dialog_box>
+
 or
+
     <dialog-box id="story-dialog" buttons='&{"cancel" => "hjq_dialog_box.close"}' > My dialog text</dialog_box>
 
 Because Ruby 1.8 Hash's do not preserve order, you may use a list of pairs instead of a Hash.
@@ -39,7 +44,7 @@ The following functions are predefined for use in dialog buttons:
  options["autoOpen"]=false unless options.has_key?("autoOpen")
 %>
  <span class="dialog-position"></span>
- <% html_attrs = add_classes(html_attrs, "hidden dialog-box") %>
+ <% html_attrs = add_classes(html_attrs, "dialog-box") %>
  <div merge-attrs="&html_attrs" data-rapid="&data_rapid('dialog-box', :options => options, :events => events, :buttons => buttons)" param="default" />
 </def>
 

data/vendor/assets/javascripts/combobox.js

@@ -109,7 +109,7 @@
 	        .attr( "tabIndex", -1 )
 	        .attr( "title", "Show All Items" )
 	        .insertAfter( input )
-	        .button({
+	        .jqbutton({
 	            icons: {
 	        	primary: "ui-icon-triangle-1-s"
 	            },
@@ -137,7 +137,7 @@
 	            .attr( "tabIndex", -1 )
 	            .attr( "title", "Clear Entry" )
 	            .insertAfter( input )
-	            .button({
+	            .jqbutton({
 	                icons: {
 	        	    primary: "ui-icon-close"
 	                },
@@ -161,7 +161,7 @@
 
 	destroy: function() {
 	    this.input.remove();
-	    this.button.remove();
+	    this.jqbutton.remove();
 	    this.element.show();
 	    $.Widget.prototype.destroy.call( this );
 	}

data/vendor/assets/javascripts/hobo_jquery_ui.js

@@ -1,2 +1,5 @@
 //= require_tree .
 
+// prevent conflict between jquery-ui and bootstrap
+$.widget.bridge('jqbutton', $.ui.button );
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hobo_jquery_ui
 version: !ruby/object:Gem::Version
-  version: 1.4.0.pre8
+  version: 2.0.0.pre1
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-01 00:00:00.000000000 Z
+date: 2012-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jquery-ui-themes
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.4.0.pre8
+        version: 2.0.0.pre1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.4.0.pre8
+        version: 2.0.0.pre1
 - !ruby/object:Gem::Dependency
   name: hobo_jquery
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.4.0.pre8
+        version: 2.0.0.pre1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.4.0.pre8
+        version: 2.0.0.pre1
 description: JQuery UI support for Hobo
 email: bryan@larsen.st
 executables: []