x/merlin
Code Issues Proposed changes

Merge "Add patched version of angular-ui bootstrap lib"

Browse Source
This commit is contained in:
Jenkins 2015-07-31 14:51:31 +00:00 committed by Gerrit Code Review
commit 5ee471c930
5 changed files with 1027 additions and 4591 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/enabled/_50_add_mistral_panel.py
View File

@ -11,7 +11,7 @@ ADD_INSTALLED_APPS = ['merlin', 'mistral']
ADD_PANEL = 'mistral.panel.MistralPanel' ADD_PANEL = 'mistral.panel.MistralPanel'
ADD_ANGULAR_MODULES = ['merlin', 'mistral'] ADD_ANGULAR_MODULES = ['merlin', 'mistral']
ADD_JS_FILES = ['merlin/js/custom-libs/ui-bootstrap-tpls-0.12.1.js', ADD_JS_FILES = ['merlin/js/custom-libs/ui-bootstrap-tpls-0.13.0.patched.js',
'merlin/js/merlin.init.js', 'merlin/js/merlin.init.js',
'merlin/js/merlin.templates.js', 'merlin/js/merlin.templates.js',
'mistral/js/mistral.init.js'] 'mistral/js/mistral.init.js']

2
karma-unit.conf.js
View File

@ -43,7 +43,7 @@ module.exports = function (config) {
'merlin/static/merlin/libs/underscore/underscore-min.js', 'merlin/static/merlin/libs/underscore/underscore-min.js',
'merlin/static/merlin/libs/js-yaml/dist/js-yaml.min.js', 'merlin/static/merlin/libs/js-yaml/dist/js-yaml.min.js',
'merlin/static/merlin/js/custom-libs/barricade.js', 'merlin/static/merlin/js/custom-libs/barricade.js',
'merlin/static/merlin/js/custom-libs/ui-bootstrap-tpls-0.12.1.js', 'merlin/static/merlin/js/custom-libs/ui-bootstrap-tpls-0.13.0.patched.js',
// explicitly require first module definition file to avoid errors // explicitly require first module definition file to avoid errors
'merlin/static/merlin/js/merlin.init.js', 'merlin/static/merlin/js/merlin.init.js',
'merlin/static/merlin/js/merlin.*.js', 'merlin/static/merlin/js/merlin.*.js',

4212
merlin/static/merlin/js/custom-libs/ui-bootstrap-tpls-0.12.0.js
View File

File diff suppressed because it is too large Load Diff

1397
merlin/static/merlin/js/custom-libs/ui-bootstrap-tpls-0.12.1.js → merlin/static/merlin/js/custom-libs/ui-bootstrap-tpls-0.13.0.patched.js
View File

File diff suppressed because it is too large Load Diff

5
merlin/test/js/merlin.directives.spec.js
View File

@ -109,8 +109,7 @@ describe('merlin directives', function() {
it('starts as being expanded', function() { it('starts as being expanded', function() {
var panel = makePanelWithInnerTags(), var panel = makePanelWithInnerTags(),
body = getPanelBody(panel); body = getPanelBody(panel);
expect(body.hasClass('collapse')).toBe(true);
expect(body.hasClass('in')).toBe(true); expect(body.hasClass('in')).toBe(true);
}); });
@ -167,7 +166,6 @@ describe('merlin directives', function() {
var element = makeGroupWithInnerTags(), var element = makeGroupWithInnerTags(),
body = getGroupBody(element); body = getGroupBody(element);
expect(body.hasClass('collapse')).toBe(true);
expect(body.hasClass('in')).toBe(true); expect(body.hasClass('in')).toBe(true);
}); });
@ -181,7 +179,6 @@ describe('merlin directives', function() {
link.triggerHandler('click'); link.triggerHandler('click');
expect(body.hasClass('collapse')).toBe(false);
expect(body.hasClass('collapsing')).toBe(true); expect(body.hasClass('collapsing')).toBe(true);
}); });