hobo_jquery_ui 1.4.0.pre8 → 2.0.0.pre1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. data/VERSION +1 -1
  2. data/taglibs/dialog_box.dryml +6 -1
  3. data/vendor/assets/javascripts/combobox.js +3 -3
  4. data/vendor/assets/javascripts/hobo_jquery_ui.js +3 -0
  5. metadata +6 -6
data/VERSION CHANGED
@@ -1 +1 @@
1
- 1.4.0.pre8
1
+ 2.0.0.pre1
data/taglibs/dialog_box.dryml CHANGED
@@ -6,16 +6,21 @@ The default for [autoOpen](http://jqueryui.com/demos/dialog/#option-autoOpen) ha
6
6
  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:
7
7
 
8
8
  <% buttons = [ ["cancel", "jQuery(this).dialog('close')"] ] %>
9
+
9
10
  or
11
+
10
12
  <% buttons = [ ["save", "hjq_dialog_box.submitAndClose"], ["cancel", "hjq_dialog_box.close"], ] %>
11
13
 
12
14
  with
15
+
13
16
  <dialog-box buttons="&buttons">My dialog text</dialog-box>
14
17
 
15
18
  Alternatively:
16
19
 
17
20
  <dialog-box id="story-dialog" buttons='&{"cancel" => "jQuery(this).dialog(\"close\")"}' >My dialog text</dialog_box>
21
+
18
22
  or
23
+
19
24
  <dialog-box id="story-dialog" buttons='&{"cancel" => "hjq_dialog_box.close"}' > My dialog text</dialog_box>
20
25
 
21
26
  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:
39
44
  options["autoOpen"]=false unless options.has_key?("autoOpen")
40
45
  %>
41
46
  <span class="dialog-position"></span>
42
- <% html_attrs = add_classes(html_attrs, "hidden dialog-box") %>
47
+ <% html_attrs = add_classes(html_attrs, "dialog-box") %>
43
48
  <div merge-attrs="&html_attrs" data-rapid="&data_rapid('dialog-box', :options => options, :events => events, :buttons => buttons)" param="default" />
44
49
  </def>
45
50
 
data/vendor/assets/javascripts/combobox.js CHANGED
@@ -109,7 +109,7 @@
109
109
  .attr( "tabIndex", -1 )
110
110
  .attr( "title", "Show All Items" )
111
111
  .insertAfter( input )
112
- .button({
112
+ .jqbutton({
113
113
  icons: {
114
114
  primary: "ui-icon-triangle-1-s"
115
115
  },
@@ -137,7 +137,7 @@
137
137
  .attr( "tabIndex", -1 )
138
138
  .attr( "title", "Clear Entry" )
139
139
  .insertAfter( input )
140
- .button({
140
+ .jqbutton({
141
141
  icons: {
142
142
  primary: "ui-icon-close"
143
143
  },
@@ -161,7 +161,7 @@
161
161
 
162
162
  destroy: function() {
163
163
  this.input.remove();
164
- this.button.remove();
164
+ this.jqbutton.remove();
165
165
  this.element.show();
166
166
  $.Widget.prototype.destroy.call( this );
167
167
  }
data/vendor/assets/javascripts/hobo_jquery_ui.js CHANGED
@@ -1,2 +1,5 @@
1
1
  //= require_tree .
2
2
 
3
+ // prevent conflict between jquery-ui and bootstrap
4
+ $.widget.bridge('jqbutton', $.ui.button );
5
+
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: hobo_jquery_ui
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.4.0.pre8
4
+ version: 2.0.0.pre1
5
5
  prerelease: 6
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-08-01 00:00:00.000000000 Z
12
+ date: 2012-09-12 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: jquery-ui-themes
@@ -34,7 +34,7 @@ dependencies:
34
34
  requirements:
35
35
  - - '='
36
36
  - !ruby/object:Gem::Version
37
- version: 1.4.0.pre8
37
+ version: 2.0.0.pre1
38
38
  type: :runtime
39
39
  prerelease: false
40
40
  version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
42
42
  requirements:
43
43
  - - '='
44
44
  - !ruby/object:Gem::Version
45
- version: 1.4.0.pre8
45
+ version: 2.0.0.pre1
46
46
  - !ruby/object:Gem::Dependency
47
47
  name: hobo_jquery
48
48
  requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
50
50
  requirements:
51
51
  - - '='
52
52
  - !ruby/object:Gem::Version
53
- version: 1.4.0.pre8
53
+ version: 2.0.0.pre1
54
54
  type: :runtime
55
55
  prerelease: false
56
56
  version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
58
58
  requirements:
59
59
  - - '='
60
60
  - !ruby/object:Gem::Version
61
- version: 1.4.0.pre8
61
+ version: 2.0.0.pre1
62
62
  description: JQuery UI support for Hobo
63
63
  email: bryan@larsen.st
64
64
  executables: []