Merge "No need to use disableDefaultClickBehaviour"

merlin/static/merlin/js/merlin.directives.js

@@ -4,14 +4,6 @@
 (function() {
   'use strict';
 
-  function disableClickDefaultBehaviour(element) {
-    element.find('a[ng-click]')
-      .on('click', function(e) {
-        e.preventDefault();
-        return true;
-      });
-  }
-
   angular.module('merlin')
     .directive('editable', function() {
       return {
@@ -86,7 +78,6 @@
         link: function(scope, element, attrs) {
           scope.removable = $parse(attrs.removable)();
           scope.isCollapsed = false;
-          disableClickDefaultBehaviour(element);
         }
       }
     })
@@ -101,7 +92,6 @@
           onRemove: '&'
         },
         link: function(scope, element, attrs) {
-          disableClickDefaultBehaviour(element);
           scope.isCollapsed = false;
           if ( attrs.onAdd && attrs.additive !== 'false' ) {
             scope.additive = true;

merlin/static/merlin/js/merlin.filters.js

@@ -22,13 +22,16 @@
           if ( angular.isArray(itemsOrContainer) && !itemsOrContainer.length ) {
             return null;
           }
-          this.id = utils.getNewId();
           if ( angular.isArray(itemsOrContainer) ) {
             this.items = itemsOrContainer;
+            this.id = itemsOrContainer.reduce(function(prevId, item) {
+              return item.uid() + prevId;
+            }, '');
           } else {
             this._barricadeContainer = itemsOrContainer;
             this._barricadeId = id;
             var barricadeObj = itemsOrContainer.getByID(id);
+            this.id = barricadeObj.uid();
             this.items = barricadeObj.getKeys().map(function(key) {
               return utils.enhanceItemWithID(barricadeObj.get(key), key);
             });
@@ -90,6 +93,8 @@
             item.getIDs().forEach(function(id) {
               hash += item.getByID(id).uid();
             });
+          } else {
+            hash += item.uid();
           }
         });
         return hash;
@@ -114,7 +119,7 @@
       return _.memoize(function(panel) {
         var rowProto = {
             create: function(items) {
-              this.id = utils.getNewId();
+              this.id = items[0].uid();
               this.index = items.row;
               this.items = items.slice();
               return this;

merlin/static/merlin/templates/collapsible-group.html

@@ -1,7 +1,7 @@
 <div class="section">
   <div class="section-heading three-columns">
     <div class="both-columns">
-      <h5><a ng-click="isCollapsed = !isCollapsed" class="collapse-entries" href="#">
+      <h5><a ng-click="isCollapsed = !isCollapsed" class="collapse-entries" href="">
         <i class="fa" ng-class="isCollapsed ? 'fa-plus-square-o' : 'fa-minus-square-o'"></i></a>
         <editable ng-if="removable" ng-model="group.title"
                   ng-model-options="{getterSetter: true}"></editable>
@@ -13,7 +13,7 @@
         <i class="fa fa-plus"></i></button>
     </div>
     <div ng-if="removable" class="add-btn button-column remove-entry">
-      <a href="#" ng-click="onRemove()">
+      <a href="" ng-click="onRemove()">
         <i class="fa fa-times-circle pull-right"></i></a>
     </div>
   </div>

merlin/static/merlin/templates/collapsible-panel.html

@@ -1,10 +1,10 @@
 <div class="panel panel-default merlin-panel">
   <div class="panel-heading" ng-show="panel.title()">
     <h4 class="panel-title">
-      <a ng-click="isCollapsed = !isCollapsed" href="#">
+      <a ng-click="isCollapsed = !isCollapsed" href="">
         <i class="fa fa-lg" ng-class="isCollapsed ? 'fa-caret-right' : 'fa-caret-down'"></i></a>
       <editable ng-model="panel.title" ng-model-options="{getterSetter: true}"></editable>
-      <a href="#" ng-show="panel.removable" ng-click="panel.remove()">
+      <a href="" ng-show="panel.removable" ng-click="panel.remove()">
         <i class="fa fa-times-circle pull-right"></i></a>
     </h4>
   </div>

merlin/static/merlin/templates/editable.html

@@ -1,7 +1,7 @@
 <span class="width-detector" style="display:none"></span>
 <span ng-show="!isEdited">
   <span ng-bind="editableValue"></span>
-  <a ng-click="isEdited = true" href="#"><i class="fa fa-pencil"></i></a>
+  <a ng-click="isEdited = true" href=""><i class="fa fa-pencil"></i></a>
 </span>
 <span ng-show="isEdited">
   <input type="text" ng-model="editableValue" show-focus="isEdited">