diff --git a/merlin/static/merlin/js/merlin.field.models.js b/merlin/static/merlin/js/merlin.field.models.js index 2d1cf08..b31a27c 100644 --- a/merlin/static/merlin/js/merlin.field.models.js +++ b/merlin/static/merlin/js/merlin.field.models.js @@ -6,9 +6,9 @@ .module('merlin') .factory('merlin.field.models', merlinFieldModels); - merlinFieldModels.$inject = ['merlin.utils', 'merlin.panel.models', '$http']; + merlinFieldModels.$inject = ['merlin.utils']; - function merlinFieldModels(utils, panels, $http) { + function merlinFieldModels(utils) { var wildcardMixin = Barricade.Blueprint.create(function() { return this; }); @@ -134,12 +134,6 @@ return this; }); - function meldGroup() { - if ( utils.getMeta(this, 'group') ) { - panels.groupmixin.call(this); - } - } - var stringModel = Barricade.Primitive.extend({ create: function(json, parameters) { var self = Barricade.Primitive.create.call(this, json, parameters); @@ -170,7 +164,6 @@ self.add = function() { self.push(undefined, parameters); }; - meldGroup.call(self); plainStructureMixin.call(self); return self; } @@ -181,7 +174,6 @@ var self = Barricade.ImmutableObject.create.call(this, json, parameters); modelMixin.call(self, 'frozendict'); - meldGroup.call(self); plainStructureMixin.call(self); return self; } @@ -245,7 +237,6 @@ self.removeItem = function(key) { self.remove(self.getPosByID(key)); }; - meldGroup.call(self); return self; } }, {'@type': Object}); diff --git a/merlin/static/merlin/js/merlin.panel.models.js b/merlin/static/merlin/js/merlin.panel.models.js deleted file mode 100644 index b37ca43..0000000 --- a/merlin/static/merlin/js/merlin.panel.models.js +++ /dev/null @@ -1,52 +0,0 @@ -/** - * Created by tsufiev on 2/24/15. - */ -(function() { - 'use strict'; - - angular - .module('merlin') - .factory('merlin.panel.models', merlinPanelModels); - - merlinPanelModels.$inject = ['merlin.utils']; - - function merlinPanelModels(utils) { - var groupMixin = Barricade.Blueprint.create(function() { - var self = this; - var additive = utils.getMeta(self, 'additive'); - var removable = utils.getMeta(self, 'removable'); - - if ( angular.isUndefined(additive) ) { - additive = true; - } - self.isAdditive = function() { - return additive; - }; - - if ( angular.isUndefined(removable) ) { - removable = false; - } - self.isRemovable = function() { - return removable; - }; - - if ( removable ) { // conditionally override common .title() - self.title = function() { - if ( arguments.length ) { - self.setID(arguments[0]); - } else { - return self.getID(); - } - }; - } - - self.setType('group'); - - return self; - }); - - return { - groupmixin: groupMixin - }; - } -})(); diff --git a/merlin/templates/merlin/base.html b/merlin/templates/merlin/base.html index 785b0ad..c0f8afd 100644 --- a/merlin/templates/merlin/base.html +++ b/merlin/templates/merlin/base.html @@ -11,7 +11,6 @@ - {% block merlin-js %}{% endblock %} {% endblock %}