pinkman 0.9.9.9.3 → 0.9.9.9.4

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 2f842e53821c4c58ca54c1105996cd3b8aa4bfa639b8b5c381063ed942ca46d3
4
- data.tar.gz: 7b4ab8589e018ba2b079a88c645306d46204fba7a4003b2598ed6a10ee626843
3
+ metadata.gz: a231f394f775160cddeef6968896b55e7d69b47fa9a6239b5e37118b79c2de8f
4
+ data.tar.gz: '095eb2d6e01ffdd9e4d22d9883dccdfe42594d9da9584aeaae1a5d529c843da3'
5
5
  SHA512:
6
- metadata.gz: ffb37332e2dd16e0015b2e9456bd213c7b33c3c3966de4cd121b74206896e2f4efdb3317ced1e7405ade122da66c0fb011c020a0fae4e9b91d99e9b764b2aefd
7
- data.tar.gz: 1e492502ef0329444a55dd0c1f35d50fa7e1924e5d9224de2b2f3b7cc62cfb0c3460e5b7b5608f94765b5f7fd9cae74c1c78ffd4f9327adb64dd120fc36681ea
6
+ metadata.gz: be51f370be89c977909abbc5e8afb2130e2be68fdcf3b20cbd9ba2da86459b09aca1889ce4e78b861e6fc7dc96ea35b3ed0c5ec1a467135003f448bc28a62fcc
7
+ data.tar.gz: ddc87c1bf40c8f93de624b9424c9f173dd2a8d53b10dd8c491524d566eca80d32fe7a3dae5bb6f3b8e2f12e0ba55c0098105e014748e35d47b76e4d37a5f5d3b
@@ -146,7 +146,7 @@ class window.PinkmanCommon
146
146
  template: options + '-template'
147
147
  target: options
148
148
 
149
- queue: (options) ->
149
+ _queue: (options) ->
150
150
  options.id = options.template
151
151
  @renderQueue = new PinkmanCollection unless @renderQueue?
152
152
  @renderQueue.directPush(options)
@@ -83,8 +83,6 @@ class window.PinkmanController extends window.PinkmanObject
83
83
  selector: "##{this.id} [data-action='#{name}']"
84
84
 
85
85
 
86
- # verificar - verify
87
- # mudei recentemente, pode estar cagado
88
86
  esc: (callback) ->
89
87
  PinkmanAction.define
90
88
  id: 'esc'
@@ -92,6 +90,7 @@ class window.PinkmanController extends window.PinkmanObject
92
90
  controller: this
93
91
  selector: "##{this.id}"
94
92
  callback: (obj, j, ev) ->
93
+ # console.log ev
95
94
  callback() if ev.keyCode == 27
96
95
 
97
96
 
@@ -165,7 +165,7 @@ Pinkman.render = (options) ->
165
165
  options.collectionReRender = true unless options.collectionReRender? and options.collectionReRender == false
166
166
  options.engine = Pinkman.template_engine unless options.engine? and options.engine != ''
167
167
  Pinkman.template_engines.render(options)
168
- options.object.queue(options) if options.reRender and options.object? and options.object.isPink
168
+ options.object._queue(options) if options.reRender and options.object? and options.object.isPink
169
169
  else
170
170
  throw "Pinkman.render: options argument is neither an object nor a string."
171
171
 
@@ -222,8 +222,6 @@ class window.PinkmanRouter
222
222
  path = if host.test(path) then path.replace(host,'') else path
223
223
  ga('set', 'page', path)
224
224
  ga('send', 'pageview', path)
225
-
226
-
227
225
 
228
226
  @render: (r, callback) ->
229
227
  @saveWindowScroll(Pinkman.routes.current.controller) if Pinkman.routes.current?
@@ -281,6 +279,7 @@ class window.PinkmanRouter
281
279
 
282
280
  @to: (args...) ->
283
281
  @force(args...)
282
+
284
283
 
285
284
  @forward: ->
286
285
  window.history.forward() if window.history?
@@ -1,4 +1,4 @@
1
1
  .form-field
2
2
  label for=attr_name = label
3
3
  == p.input html_attributes
4
- == p.error_for attr_name, label
4
+ == p.error_for error_for_name, label
@@ -10,4 +10,4 @@
10
10
  - options_hash.each do |k,v|
11
11
  option value=k = v
12
12
 
13
- == p.error_for attr_name, label
13
+ == p.error_for error_for_name, label
@@ -1,4 +1,4 @@
1
1
  .form-field
2
2
  label for=attr_name = label
3
3
  == p.textarea textarea_options
4
- == p.error_for attr_name, label
4
+ == p.error_for error_for_name, label
@@ -15,7 +15,8 @@ module Pinkman
15
15
 
16
16
  define_helper :text do |attr_name,label=nil,html_attributes={}|
17
17
  label ||= attr_name.titleize
18
- render partial: 'pinkman/pinkman/form_textarea', locals: {attr_name: attr_name, label: label, textarea_options: {name: attr_name}.merge(html_attributes) }
18
+ error_for_name = html_attributes.delete(:error_for) || attr_name
19
+ render partial: 'pinkman/pinkman/form_textarea', locals: {attr_name: attr_name, label: label, error_for_name: error_for_name, textarea_options: {name: attr_name}.merge(html_attributes) }
19
20
  end
20
21
 
21
22
  define_helper :date do |attr_name,label=nil,html_attributes={}|
@@ -38,7 +39,8 @@ module Pinkman
38
39
  end
39
40
  obligatory = true if obligatory.nil?
40
41
  label ||= attr_name.titleize
41
- render partial: 'pinkman/pinkman/form_select', locals: {attr_name: attr_name, label: label, options_hash: options_hash, html_attributes: html_attributes, placeholder: placeholder, obligatory: obligatory}
42
+ error_for_name = html_attributes.delete(:error_for) || attr_name
43
+ render partial: 'pinkman/pinkman/form_select', locals: {attr_name: attr_name, label: label, error_for_name: error_for_name, options_hash: options_hash, html_attributes: html_attributes, placeholder: placeholder, obligatory: obligatory}
42
44
  end
43
45
 
44
46
  define_helper :password do |attr_name,label=nil,html_attributes={}|
@@ -1,3 +1,3 @@
1
1
  module Pinkman
2
- VERSION = "0.9.9.9.3"
2
+ VERSION = "0.9.9.9.4"
3
3
  end
@@ -6,9 +6,10 @@ module Pinkman
6
6
 
7
7
  extend Pinkman::BaseHelper
8
8
 
9
- define_helper :input_helper do |attr_name,label=nil,html_attributes={}|
9
+ define_helper :input_helper do |attr_name,label=nil,options={}|
10
10
  label ||= attr_name.titleize
11
- render partial: 'pinkman/pinkman/form_input', locals: {attr_name: attr_name, label: label, html_attributes: html_attributes.merge(name: attr_name)}
11
+ error_for_name = options.delete(:error_for) || attr_name
12
+ render partial: 'pinkman/pinkman/form_input', locals: {attr_name: attr_name, label: label, error_for_name: error_for_name, html_attributes: options.merge(name: attr_name)}
12
13
  end
13
14
 
14
15
  define_helper :textfield do |attr_name,label=nil|
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: pinkman
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.9.9.9.3
4
+ version: 0.9.9.9.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Agilso Oliveira
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2018-03-27 00:00:00.000000000 Z
11
+ date: 2018-03-29 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler