promethee 1.2.5 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4b9d50abe08aefaa61c8396da39edd89033e566
-  data.tar.gz: 9e8537becee50077661dff2c63bbbb684a36289b
+  metadata.gz: 3990e672da334008485f049f367526eb7d1de150
+  data.tar.gz: 734e6bf4740e8921560d4f9d7d2996097171b987
 SHA512:
-  metadata.gz: c98cd1ec67d66a6caa5537701ab6fdfff18b13b7aaf243adebb492fb49b83453a0d08e4af4729925aa8f913b038062295efbd9501ab14bece35508df148d160f
-  data.tar.gz: '091df77e01cf5c913ecbac0ec30d127c5e3f789b9ab75deb1d40b50424c59d1055a94aea397bdcebb7d03cf893b06cb3797cfaf02e59b8666800c51feecb52c9'
+  metadata.gz: ac9f482156241a315f378b62258e931d905543b4b74bdec8770cf44b09f65317fb2ec11cac484ec9b92f3e6735c9830d0b8de97b1e0021a9848d66f73dd98bd4
+  data.tar.gz: 35611d794ddf5c884e8ba4efd8b31e0785ecac3aca7d70d3bb579ee4ae40ffdfff538f62a3274f7cb1c6bd7e45f0230a0432433f285c97bb9489bd8ffe5baf62

data/app/views/promethee/_edit.html.erb

@@ -52,6 +52,21 @@ var promethee = angular
 
       return words[0] === '' ? 0 : words.length;
     };
+  })
+  // Why doesn't this method just live in the adder controller ?
+  // Because the row component also need a special access to it in order to create cols with an id. So we make it global to the application.
+  .provider('identifier', function() {
+    this.$get = function() {
+      return {
+        // https://gist.github.com/gordonbrander/2230317
+        generate: function() {
+          // Math.random should be unique because of its seeding algorithm.
+          // Convert it to base 36 (numbers + letters), and grab the first 9 characters
+          // after the decimal.
+          return '' + Math.random().toString(36).substr(2, 9);
+        }
+      };
+    };
   });
 
 promethee.controller('PrometheeController', ['$scope', function($scope) {

data/app/views/promethee/components/row/_edit.write.html.erb

@@ -1,7 +1,7 @@
 <script type="text/ng-template" id="promethee/components/row/edit/write">
   <div  ng-controller="RowController"
         ng-click="inspect(component, $event)"
-        class=" row 
+        class=" row
                 promethee-edit__component
                 promethee-edit__component--row">
     <div class="promethee-edit__component-selected" ng-class="{'promethee-edit__component-selected--visible': promethee.inspected === component}">
@@ -17,10 +17,11 @@
 </script>
 
 <script>
-  promethee.controller('RowController', ['$scope', function($scope) {
+  promethee.controller('RowController', ['$scope', 'identifier', function($scope, identifier) {
     $scope.addColumn = function() {
       this.component.children.push({
         type: 'column',
+        id: identifier.generate(),
         attributes: {
           size: 4,
           offset: 0

data/app/views/promethee/edit/_write.html.erb

@@ -1,5 +1,5 @@
 <script type="text/javascript">
-promethee.controller('AdderController', ['$scope', '$rootScope', 'definitions', function($scope, $rootScope, definitions) {
+promethee.controller('AdderController', ['$scope', '$rootScope', 'definitions', 'identifier', function($scope, $rootScope, definitions, identifier) {
 
   $scope.adding = false;
   $scope.childrenToAddTo = null;
@@ -12,7 +12,7 @@ promethee.controller('AdderController', ['$scope', '$rootScope', 'definitions',
 
   $scope.pushComponent = function(definition) {
     var definition = angular.copy(definition.data);
-    definition.id = $scope.createIdentifier();
+    definition.id = identifier.generate();
     $scope.childrenToAddTo.push(definition);
     $scope.close();
   };
@@ -22,21 +22,13 @@ promethee.controller('AdderController', ['$scope', '$rootScope', 'definitions',
     $scope.childrenToAddTo = components;
   };
 
-  // https://gist.github.com/gordonbrander/2230317
-  $scope.createIdentifier = function () {
-    // Math.random should be unique because of its seeding algorithm.
-    // Convert it to base 36 (numbers + letters), and grab the first 9 characters
-    // after the decimal.
-    return '' + Math.random().toString(36).substr(2, 9);
-  };
-
 }])
 </script>
 
 <div class="promethee-edit__write" ng-show="promethee.mode == 'write'">
   <div ng-class="{ 'container-fluid': promethee.fullscreen }">
     <div  ng-init="component = promethee.data"
-          class=" promethee-edit__component 
+          class=" promethee-edit__component
                   promethee-edit__component--page">
       <ng-include src="'promethee/write/components'"></ng-include>
     </div>

data/lib/promethee/rails/version.rb

@@ -1,5 +1,5 @@
 module Promethee
   module Rails
-    VERSION = '1.2.5'
+    VERSION = '1.2.6'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: promethee
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.6
 platform: ruby
 authors:
 - Julien Dargelos