Browse Source

Remove obsolete 'group' mixin files and references

Change-Id: I8b58d1fac56df5b781e3b5bc5f924098fefa9a8c
changes/34/209234/2
Timur Sufiev 4 years ago
parent
commit
950164bbc1

+ 2
- 11
merlin/static/merlin/js/merlin.field.models.js View File

@@ -6,9 +6,9 @@
6 6
     .module('merlin')
7 7
     .factory('merlin.field.models', merlinFieldModels);
8 8
 
9
-  merlinFieldModels.$inject = ['merlin.utils', 'merlin.panel.models', '$http'];
9
+  merlinFieldModels.$inject = ['merlin.utils'];
10 10
 
11
-  function merlinFieldModels(utils, panels, $http) {
11
+  function merlinFieldModels(utils) {
12 12
     var wildcardMixin = Barricade.Blueprint.create(function() {
13 13
       return this;
14 14
     });
@@ -134,12 +134,6 @@
134 134
       return this;
135 135
     });
136 136
 
137
-    function meldGroup() {
138
-      if ( utils.getMeta(this, 'group') ) {
139
-        panels.groupmixin.call(this);
140
-      }
141
-    }
142
-
143 137
     var stringModel = Barricade.Primitive.extend({
144 138
       create: function(json, parameters) {
145 139
         var self = Barricade.Primitive.create.call(this, json, parameters);
@@ -170,7 +164,6 @@
170 164
         self.add = function() {
171 165
           self.push(undefined, parameters);
172 166
         };
173
-        meldGroup.call(self);
174 167
         plainStructureMixin.call(self);
175 168
         return self;
176 169
       }
@@ -181,7 +174,6 @@
181 174
         var self = Barricade.ImmutableObject.create.call(this, json, parameters);
182 175
 
183 176
         modelMixin.call(self, 'frozendict');
184
-        meldGroup.call(self);
185 177
         plainStructureMixin.call(self);
186 178
         return self;
187 179
       }
@@ -245,7 +237,6 @@
245 237
         self.removeItem = function(key) {
246 238
           self.remove(self.getPosByID(key));
247 239
         };
248
-        meldGroup.call(self);
249 240
         return self;
250 241
       }
251 242
     }, {'@type': Object});

+ 0
- 52
merlin/static/merlin/js/merlin.panel.models.js View File

@@ -1,52 +0,0 @@
1
-/**
2
- * Created by tsufiev on 2/24/15.
3
- */
4
-(function() {
5
-  'use strict';
6
-
7
-  angular
8
-    .module('merlin')
9
-    .factory('merlin.panel.models', merlinPanelModels);
10
-
11
-  merlinPanelModels.$inject = ['merlin.utils'];
12
-
13
-  function merlinPanelModels(utils) {
14
-    var groupMixin = Barricade.Blueprint.create(function() {
15
-      var self = this;
16
-      var additive = utils.getMeta(self, 'additive');
17
-      var removable = utils.getMeta(self, 'removable');
18
-
19
-      if ( angular.isUndefined(additive) ) {
20
-        additive = true;
21
-      }
22
-      self.isAdditive = function() {
23
-        return additive;
24
-      };
25
-
26
-      if ( angular.isUndefined(removable) ) {
27
-        removable = false;
28
-      }
29
-      self.isRemovable = function() {
30
-        return removable;
31
-      };
32
-
33
-      if ( removable ) { // conditionally override common .title()
34
-        self.title = function() {
35
-          if ( arguments.length ) {
36
-            self.setID(arguments[0]);
37
-          } else {
38
-            return self.getID();
39
-          }
40
-        };
41
-      }
42
-
43
-      self.setType('group');
44
-
45
-      return self;
46
-    });
47
-
48
-    return {
49
-      groupmixin: groupMixin
50
-    };
51
-  }
52
-})();

+ 0
- 1
merlin/templates/merlin/base.html View File

@@ -11,7 +11,6 @@
11 11
   <script type="text/javascript" src="{{ STATIC_URL }}merlin/js/merlin.filters.js"></script>
12 12
   <script type="text/javascript" src="{{ STATIC_URL }}merlin/js/merlin.directives.js"></script>
13 13
   <script type="text/javascript" src="{{ STATIC_URL }}merlin/js/merlin.field.models.js"></script>
14
-  <script type="text/javascript" src="{{ STATIC_URL }}merlin/js/merlin.panel.models.js"></script>
15 14
   <script type="text/javascript" src="{{ STATIC_URL }}merlin/js/merlin.utils.js"></script>
16 15
   {% block merlin-js %}{% endblock %}
17 16
 {% endblock %}

Loading…
Cancel
Save