promethee 1.4.21 → 1.4.22

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
  SHA1:
3
- metadata.gz: 74933da07ed7de8d94e34988b4f57e5fa6a2dbd0
4
- data.tar.gz: 930432389d529e9cceb4ff1aa51fc1231a1764fd
3
+ metadata.gz: 877b939e0fd4ae53e3a50485be5b993ca0a35d28
4
+ data.tar.gz: f0325ae85de5113c0610e61918ab05360a276f02
5
5
  SHA512:
6
- metadata.gz: 3ed4e6e2a48517c9fffaccfe4e66e6221e5812ea99e7de08b70a65781ffdd8b511a34fbf110f24304b091b2fdd5dc0e4bfe3cbc83ea1a7a861eadfdc5428f4c0
7
- data.tar.gz: 79bf195554ff5e4a9861e21c85807adbae3ca15e4990144adfb58cac8e7f05d818cf97c6d087110a04c866f194f8ca0c1eda5cf2302710da89cb5112deff991d
6
+ metadata.gz: 2ce29553f6eddcff4c9269e7d509e63bdc7f5b5bf2fdf10496416301c87a0b4527e411d762b02801ac3b762c4576b6e7e297821add3480935cce8a031aa1a22e
7
+ data.tar.gz: 8d83c8d3860b8555d9779cff2f35a216fca90e4f3dd959eb5d73c04321ed75fc3e58dd2603ff5ae3de83f2d86d1668171f4c2bdf3906792bd1f61d229540b5e0
data/README.md CHANGED
@@ -145,7 +145,7 @@ With stylesheets set:
145
145
  ```
146
146
  @import 'bootstrap'
147
147
  @import 'font-awesome.css'
148
- @import 'summernote'
148
+ @import 'summernote.css'
149
149
  @import 'promethee'
150
150
  @import 'promethee-edit'
151
151
  ```
@@ -53,17 +53,23 @@ promethee.controller('PrometheeController', ['$scope', 'summernoteConfig', 'pres
53
53
  fullscreen: true
54
54
  };
55
55
 
56
- $scope.upload = function (file, component) {
56
+ $scope.upload = function (file, component, store) {
57
57
  if (file == undefined) {
58
58
  return;
59
59
  }
60
+
61
+
62
+ if (store === undefined) {
63
+ store = component.attributes;
64
+ }
65
+
60
66
  $scope.promethee.inspected = component;
61
67
  Upload.upload({
62
68
  url: '/promethee/blob',
63
69
  data: { file: file },
64
70
  headers: { 'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content') }
65
71
  }).then(function (resp) {
66
- component.attributes.blob = resp.data;
72
+ store.blob = resp.data;
67
73
  $scope.upload_error = undefined;
68
74
  }, function (resp) {
69
75
  $scope.upload_error = "An error occured (error " + resp.status + ": " + resp.statusText + ")";
@@ -2,14 +2,14 @@
2
2
  <div ng-click="inspect(component, $event)"
3
3
  ng-class="{'promethee-edit__component--selected': promethee.inspected === component}"
4
4
  class=" <%= promethee_bem_classes 'promethee-edit__component', "--column" %>
5
- col
6
- col-md-{{component.attributes.size}}
5
+ col
6
+ col-md-{{component.attributes.size}}
7
7
  col-md-offset-{{component.attributes.offset}}">
8
8
  <div class="promethee-edit__component__inner">
9
9
  <%= render 'promethee/edit/move.remove' %>
10
10
  <div class="header">Column</div>
11
11
  <ng-include src="'promethee/move/components'"></ng-include>
12
- <div
12
+ <div
13
13
  droppable
14
14
  class=" <%= promethee_bem_classes 'promethee-edit__move__droppable', '--row', '--inside-column' %>"
15
15
  data-index="{{$index+1}}"
@@ -1,5 +1,5 @@
1
1
  module Promethee
2
2
  module Rails
3
- VERSION = '1.4.21'
3
+ VERSION = '1.4.22'
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.4.21
4
+ version: 1.4.22
5
5
  platform: ruby
6
6
  authors:
7
7
  - Julien Dargelos
@@ -13,7 +13,7 @@ authors:
13
13
  autorequire:
14
14
  bindir: bin
15
15
  cert_chain: []
16
- date: 2018-05-02 00:00:00.000000000 Z
16
+ date: 2018-05-04 00:00:00.000000000 Z
17
17
  dependencies:
18
18
  - !ruby/object:Gem::Dependency
19
19
  name: rails
@@ -358,7 +358,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
358
358
  version: '0'
359
359
  requirements: []
360
360
  rubyforge_project:
361
- rubygems_version: 2.6.13
361
+ rubygems_version: 2.6.12
362
362
  signing_key:
363
363
  specification_version: 4
364
364
  summary: Bring fire to your page