RubyApp 0.5.36 → 0.5.37

Sign up to get free protection for your applications and to get access to all the features.
Files changed (15) hide show
  1. data/Gemfile.lock +1 -1
  2. data/lib/ruby_app/elements/mobile/default/features/lists_page.css.haml +2 -0
  3. data/lib/ruby_app/elements/mobile/default/features/lists_page.js.haml +2 -0
  4. data/lib/ruby_app/elements/mobile/default/features/lists_page.rb +3 -2
  5. data/lib/ruby_app/elements/mobile/dialogs/calendars/month_dialog.rb +2 -2
  6. data/lib/ruby_app/elements/mobile/dialogs/response_dialog.rb +1 -1
  7. data/lib/ruby_app/elements/mobile/document.html.haml +3 -0
  8. data/lib/ruby_app/elements/mobile/document.rb +0 -2
  9. data/lib/ruby_app/elements/mobile/inputs/toggle_input.html.haml +2 -2
  10. data/lib/ruby_app/elements/mobile/lists/select.rb +5 -2
  11. data/lib/ruby_app/elements/mobile/navigation/hide_button.rb +1 -1
  12. data/lib/ruby_app/elements/mobile/page.rb +5 -1
  13. data/lib/ruby_app/elements/mobile/pages/information_page.css.haml +1 -0
  14. data/lib/ruby_app/version.rb +1 -1
  15. metadata +4 -4
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- RubyApp (0.5.36)
4
+ RubyApp (0.5.37)
5
5
  BlueCloth
6
6
  chronic
7
7
  chronic_duration
data/lib/ruby_app/elements/mobile/default/features/lists_page.css.haml CHANGED
@@ -1,5 +1,7 @@
1
1
  = RubyApp::Elements::Mobile::Dialogs::AcknowledgementDialog.render(:css)
2
2
  = RubyApp::Elements::Mobile::List.render(:css)
3
+ = RubyApp::Elements::Mobile::List::ListDivider.render(:css)
4
+ = RubyApp::Elements::Mobile::List::ListSplitItem.render(:css)
3
5
  = RubyApp::Elements::Mobile::Lists::Select.render(:css)
4
6
  = RubyApp::Elements::Mobile::Navigation::BackButton.render(:css)
5
7
  = yield
data/lib/ruby_app/elements/mobile/default/features/lists_page.js.haml CHANGED
@@ -1,5 +1,7 @@
1
1
  = RubyApp::Elements::Mobile::Dialogs::AcknowledgementDialog.render(:js)
2
2
  = RubyApp::Elements::Mobile::List.render(:js)
3
+ = RubyApp::Elements::Mobile::List::ListDivider.render(:js)
4
+ = RubyApp::Elements::Mobile::List::ListSplitItem.render(:js)
3
5
  = RubyApp::Elements::Mobile::Lists::Select.render(:js)
4
6
  = RubyApp::Elements::Mobile::Navigation::BackButton.render(:js)
5
7
  = yield
data/lib/ruby_app/elements/mobile/default/features/lists_page.rb CHANGED
@@ -23,7 +23,7 @@ module RubyApp
23
23
  @back_button = RubyApp::Elements::Mobile::Navigation::BackButton.new
24
24
 
25
25
  @list = RubyApp::Elements::Mobile::List.new
26
- @list.attributes.merge!('data-inset' => true)
26
+ @list.attributes.merge!('data-inset' => 'true')
27
27
  @list.items += [ RubyApp::Elements::Mobile::List::ListDivider.new('List') ]
28
28
  @list.items += [ 'Item 01',
29
29
  'Item 02',
@@ -39,13 +39,14 @@ module RubyApp
39
39
  end
40
40
 
41
41
  @select = RubyApp::Elements::Mobile::Lists::Select.new
42
- @select.attributes.merge!('data-inset' => true)
42
+ @select.attributes.merge!('data-inset' => 'true')
43
43
  @select.items += [ RubyApp::Elements::Mobile::List::ListDivider.new('Select') ]
44
44
  @select.items += [ 'Item 11',
45
45
  'Item 12',
46
46
  'Item 13',
47
47
  'Item 14',
48
48
  'Item 15' ].collect { |item| RubyApp::Elements::Mobile::List::ListSplitItem.new(item) }
49
+ @select.selected_item = 'Item 11'
49
50
 
50
51
  @select.item_clicked do |element, event|
51
52
  RubyApp::Elements::Mobile::Dialog.show(event, RubyApp::Elements::Mobile::Dialogs::AcknowledgementDialog.new('List', "You clicked the item #{event.item.item}."), :transition => 'pop')
data/lib/ruby_app/elements/mobile/dialogs/calendars/month_dialog.rb CHANGED
@@ -29,7 +29,7 @@ module RubyApp
29
29
  @previous_link = RubyApp::Elements::Mobile::Button.new
30
30
  @previous_link.attributes.merge!('data-icon' => 'arrow-l',
31
31
  'data-iconpos' => 'left',
32
- 'data-inline' => true)
32
+ 'data-inline' => 'true')
33
33
  @previous_link.clicked do |element, event|
34
34
  @month.move_previous(event)
35
35
  event.update_text('div[data-role="header"] h1', RubyApp::Language.locale.strftime(@month.display, '%b %Y'))
@@ -46,7 +46,7 @@ module RubyApp
46
46
  @next_link = RubyApp::Elements::Mobile::Button.new
47
47
  @next_link.attributes.merge!('data-icon' => 'arrow-r',
48
48
  'data-iconpos' => 'right',
49
- 'data-inline' => true)
49
+ 'data-inline' => 'true')
50
50
  @next_link.clicked do |element, event|
51
51
  @month.move_next(event)
52
52
  event.update_text('div[data-role="header"] h1', RubyApp::Language.locale.strftime(@month.display, '%b %Y'))
data/lib/ruby_app/elements/mobile/dialogs/response_dialog.rb CHANGED
@@ -16,7 +16,7 @@ module RubyApp
16
16
 
17
17
  def initialize
18
18
  super
19
- self.attributes.merge!('data-inline' => true)
19
+ self.attributes.merge!('data-inline' => 'true')
20
20
  self.options.merge!(:transition => 'pop')
21
21
  end
22
22
 
data/lib/ruby_app/elements/mobile/document.html.haml CHANGED
@@ -12,8 +12,11 @@
12
12
  - self.stylesheets.each do |stylesheet|
13
13
  %link{:rel => 'stylesheet',
14
14
  :href => stylesheet}
15
+ %link{:rel => 'stylesheet',
16
+ :href => "/#{RubyApp::Language.locale.code}/document.css"}
15
17
  - self.scripts.each do |script|
16
18
  %script{:src => script}
19
+ %script{:src => "/#{RubyApp::Language.locale.code}/document.js"}
17
20
 
18
21
  %meta{:name => :session, :content => RubyApp::Session.session_id}
19
22
  %meta{:name => :locale, :content => RubyApp::Language.locale.code}
data/lib/ruby_app/elements/mobile/document.rb CHANGED
@@ -44,11 +44,9 @@ module RubyApp
44
44
  @metadata.merge!('viewport' => 'width=device-width, initial-scale=1')
45
45
 
46
46
  @stylesheets.push('http://code.jquery.com/mobile/1.1.0-rc.1/jquery.mobile-1.1.0-rc.1.css')
47
- @stylesheets.push("/#{RubyApp::Language.locale.code}/document.css")
48
47
 
49
48
  @scripts.push('http://code.jquery.com/jquery-1.7.1.js')
50
49
  @scripts.push('http://code.jquery.com/mobile/1.1.0-rc.1/jquery.mobile-1.1.0-rc.1.js')
51
- @scripts.push("/#{RubyApp::Language.locale.code}/document.js")
52
50
 
53
51
  end
54
52
 
data/lib/ruby_app/elements/mobile/inputs/toggle_input.html.haml CHANGED
@@ -2,6 +2,6 @@
2
2
  #{__FILE__}
3
3
  %select{self.attributes}
4
4
  %option{:value => 'false', :selected => self.value == false}
5
- = RubyApp::Elements::Mobile::Inputs::ToggleInput.translate._off
5
+ = yield(:off) || RubyApp::Elements::Mobile::Inputs::ToggleInput.translate._off
6
6
  %option{:value => 'true', :selected => self.value == true}
7
- = RubyApp::Elements::Mobile::Inputs::ToggleInput.translate._on
7
+ = yield(:on) || RubyApp::Elements::Mobile::Inputs::ToggleInput.translate._on
data/lib/ruby_app/elements/mobile/lists/select.rb CHANGED
@@ -15,11 +15,14 @@ module RubyApp
15
15
 
16
16
  def initialize
17
17
  super
18
- self.attributes.merge!('data-selected-theme' => 'a')
18
+ self.attributes.merge!('data-selected-theme' => 'b')
19
19
  end
20
20
 
21
21
  def selected_item=(item)
22
- @selected_item = item
22
+ @selected_item.attributes.merge!('data-theme' => nil) if @selected_item
23
+ selected_items = self.items.select { |_item| _item.item == item }
24
+ @selected_item = selected_items.first
25
+ @selected_item.attributes.merge!('data-theme' => self.attributes['data-selected-theme']) if @selected_item
23
26
  end
24
27
 
25
28
  protected
data/lib/ruby_app/elements/mobile/navigation/hide_button.rb CHANGED
@@ -14,7 +14,7 @@ module RubyApp
14
14
  def initialize
15
15
  super
16
16
 
17
- self.options.merge!(:reverse => true)
17
+ self.options.merge!(:reverse => 'true')
18
18
 
19
19
  self.clicked do |element, event|
20
20
  RubyApp::Session.document.pages.last.hide(event, self.options)
data/lib/ruby_app/elements/mobile/page.rb CHANGED
@@ -90,6 +90,7 @@ module RubyApp
90
90
  event :shown
91
91
  event :before_hidden
92
92
  event :hidden
93
+ event :unloaded
93
94
  event :swiped
94
95
 
95
96
  def initialize
@@ -131,7 +132,10 @@ module RubyApp
131
132
  end
132
133
 
133
134
  def on_hidden(event)
134
- RubyApp::Session.document.pages.pop if RubyApp::Session.document.pages.last == self
135
+ if RubyApp::Session.document.pages.last == self
136
+ RubyApp::Session.document.pages.pop
137
+ unloaded(event)
138
+ end
135
139
  hidden(event)
136
140
  end
137
141
 
data/lib/ruby_app/elements/mobile/pages/information_page.css.haml CHANGED
@@ -1,5 +1,6 @@
1
1
  = RubyApp::Elements::Mobile::Navigation::BackButton.render(:css)
2
2
  = RubyApp::Elements::Mobile::Navigation::NavigationLink.render(:css)
3
+ = RubyApp::Elements::Mobile::Pages::Information::InformationList.render(:css)
3
4
  = RubyApp::Elements::Mobile::Pages::Information::SessionsPage.render(:css)
4
5
  = RubyApp::Elements::Mobile::Pages::Information::ScriptsPage.render(:css)
5
6
  = yield
data/lib/ruby_app/version.rb CHANGED
@@ -1,4 +1,4 @@
1
1
  module RubyApp
2
- VERSION = "0.5.36"
2
+ VERSION = "0.5.37"
3
3
  ROOT = File.expand_path(File.dirname(__FILE__))
4
4
  end
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: RubyApp
3
3
  version: !ruby/object:Gem::Version
4
- hash: 67
4
+ hash: 65
5
5
  prerelease:
6
6
  segments:
7
7
  - 0
8
8
  - 5
9
- - 36
10
- version: 0.5.36
9
+ - 37
10
+ version: 0.5.37
11
11
  platform: ruby
12
12
  authors:
13
13
  - Frank G. Ficnar
@@ -15,7 +15,7 @@ autorequire:
15
15
  bindir: bin
16
16
  cert_chain: []
17
17
 
18
- date: 2012-05-03 00:00:00 Z
18
+ date: 2012-05-09 00:00:00 Z
19
19
  dependencies:
20
20
  - !ruby/object:Gem::Dependency
21
21
  prerelease: false