promethee 1.11.25 → 1.11.26

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: f64874c36b9f5787d2e2cdcf97a7d833cd7cc2c2abd28bd5c0478151207e4624
4
- data.tar.gz: 17758c5432c9382a668040890580b8aa8ab5265ed745aab31fe995daa11f816e
3
+ metadata.gz: da0b276b93e942df0bc7eea0c8ca7a2f605a1cd4e6d55165cd753621018d7f2c
4
+ data.tar.gz: ba7c035998693f4fe0d3292754a72c33ae2e05cd2d8e494d0e724618ca56ffa1
5
5
  SHA512:
6
- metadata.gz: f020fc077bee3525d47b54bd61e180d4315c3b5663eb65b13df95e182a8b988402d9a7ce357ab46775e8bbfbd2c52f79db05c9a3d1ee8ddc414f57544d96eb1a
7
- data.tar.gz: 04c4416686698a97346981bf0f2f4cc069a53aafde70d160e78cd454f540bda0ec1110b95dc029958d44465bce6eb8a834601d7161b8391c0a4a90cf06473edb
6
+ metadata.gz: 76dc4d4e41e80b1ee233ed5ff1130b814ed96454890bf15d506f848f11311e2aa7c151ca2a2bf702122667a8ae21deaac9e8221672611279092e44734f873c27
7
+ data.tar.gz: cdee09b98ed1029ff41e105dd29197ac551cddfb60b7584e291a0ca0d174bc071102b9ad6ac2e4938b6ca0cb297ca2121dfa2b8dc721db354b3548d656781713
@@ -18,18 +18,15 @@
18
18
  </div>
19
19
  <div class="form-group">
20
20
  <label class="label-control">Offset: {{promethee.inspected.attributes.offset}}</label><br/>
21
- <input ng-model="promethee.inspected.attributes.offset"
22
- type="range"
23
- class="btn-block"
24
- list="tickmarks"
25
- min="0"
26
- max="{{12-promethee.inspected.attributes.size}}">
21
+ <offset-input ng-model="promethee.inspected.attributes.offset"
22
+ ng-max="12 - promethee.inspected.attributes.size">
23
+ </offset-input>
27
24
  </div>
28
25
 
29
26
  <%= render 'promethee/edit/inspect.advanced' %>
30
27
  <div class="form-group">
31
- <input id="column_edit_inspect_tablet_enabled"
32
- ng-model="promethee.inspected.attributes.tablet.enabled"
28
+ <input id="column_edit_inspect_tablet_enabled"
29
+ ng-model="promethee.inspected.attributes.tablet.enabled"
33
30
  type="checkbox" />
34
31
  <label class="label-control"
35
32
  for="column_edit_inspect_tablet_enabled"> <b>Tablette</b></label>
@@ -46,18 +43,15 @@
46
43
  </div>
47
44
  <div class="form-group">
48
45
  <label class="label-control">Offset: {{promethee.inspected.attributes.tablet.offset}}</label><br/>
49
- <input ng-model="promethee.inspected.attributes.tablet.offset"
50
- type="range"
51
- class="btn-block"
52
- list="tickmarks"
53
- min="0"
54
- max="{{12-promethee.inspected.attributes.tablet.size}}">
46
+ <offset-input ng-model="promethee.inspected.attributes.tablet.offset"
47
+ ng-max="12 - promethee.inspected.attributes.tablet.size">
48
+ </offset-input>
55
49
  </div>
56
50
  </div>
57
51
 
58
52
  <div class="form-group">
59
- <input id="column_edit_inspect_mobile_enabled"
60
- ng-model="promethee.inspected.attributes.mobile.enabled"
53
+ <input id="column_edit_inspect_mobile_enabled"
54
+ ng-model="promethee.inspected.attributes.mobile.enabled"
61
55
  type="checkbox" />
62
56
  <label class="label-control"
63
57
  for="column_edit_inspect_mobile_enabled"> <b>Mobile</b></label>
@@ -74,12 +68,9 @@
74
68
  </div>
75
69
  <div class="form-group">
76
70
  <label class="label-control">Offset: {{promethee.inspected.attributes.mobile.offset}}</label><br/>
77
- <input ng-model="promethee.inspected.attributes.mobile.offset"
78
- type="range"
79
- class="btn-block"
80
- list="tickmarks"
81
- min="0"
82
- max="{{12-promethee.inspected.attributes.mobile.size}}">
71
+ <offset-input ng-model="promethee.inspected.attributes.mobile.offset"
72
+ ng-max="12 - promethee.inspected.attributes.mobile.size">
73
+ </offset-input>
83
74
  </div>
84
75
  </div>
85
76
  </div>
@@ -0,0 +1,32 @@
1
+ <script type="text/ng-template" id="offset_input">
2
+ <input ng-model="ngModel"
3
+ ng-change="checkOffsetValid()"
4
+ type="range"
5
+ class="btn-block"
6
+ list="tickmarks"
7
+ min="0"
8
+ max="12">
9
+ </script>
10
+
11
+ <script>
12
+ promethee.directive('offsetInput', function() {
13
+ return {
14
+ restrict: 'E',
15
+ scope: {
16
+ ngModel: '=',
17
+ ngMax: "="
18
+ },
19
+ templateUrl: 'offset_input',
20
+ controller: function($scope) {
21
+ $scope.$watch('ngMax', function () {
22
+ $scope.checkOffsetValid();
23
+ });
24
+
25
+ $scope.checkOffsetValid = function () {
26
+ $scope.ngModel = Math.min($scope.ngModel, $scope.ngMax);
27
+ };
28
+ }
29
+ }
30
+ });
31
+
32
+ </script>
@@ -1,5 +1,5 @@
1
1
  module Promethee
2
2
  module Rails
3
- VERSION = '1.11.25'
3
+ VERSION = '1.11.26'
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: promethee
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.11.25
4
+ version: 1.11.26
5
5
  platform: ruby
6
6
  authors:
7
7
  - Sébastien Gaya
@@ -14,7 +14,7 @@ authors:
14
14
  autorequire:
15
15
  bindir: bin
16
16
  cert_chain: []
17
- date: 2019-01-14 00:00:00.000000000 Z
17
+ date: 2019-01-17 00:00:00.000000000 Z
18
18
  dependencies:
19
19
  - !ruby/object:Gem::Dependency
20
20
  name: rails
@@ -287,6 +287,7 @@ files:
287
287
  - app/views/promethee/show/_component.html.erb
288
288
  - app/views/promethee/show/_components.html.erb
289
289
  - app/views/promethee/show/_image.srcset.html.erb
290
+ - app/views/promethee/templates/_offset-input.html.erb
290
291
  - app/views/promethee/templates/_uploader.html.erb
291
292
  - app/views/promethee/utils/_html-safe.html.erb
292
293
  - app/views/promethee/utils/_humanize.html.erb