x/merlin
Code Issues Proposed changes

Remove obsolete 'group' mixin files and references

Browse Source 
Change-Id: I8b58d1fac56df5b781e3b5bc5f924098fefa9a8c
This commit is contained in:
Timur Sufiev 2015-07-29 15:12:01 +03:00
parent b9e6ccb3ea
commit 950164bbc1
3 changed files with 2 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
merlin/static/merlin/js/merlin.field.models.js
View File

@ -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});

52
merlin/static/merlin/js/merlin.panel.models.js
View File

@ -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
};
}
})();

1
merlin/templates/merlin/base.html
View File

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