Browse Source

Add patched version of angular-ui bootstrap lib

This patch adds patched version of angular-ui/bootstrap lib.
We need to patch it because of typeahead - one of bootstrap
components. This component does not support
ngModelOptions="{getterSetter: true}", which we need for
barricade.js integration.
Angular-ui/bootstrap upstream bug:
https://github.com/angular-ui/bootstrap/issues/3823
Until this bug is not fixed in upstream version,
we need to use this patched version of library.

Change-Id: I30a5d52d3a638fa2d7ca110d8824682c3d205611
Paul Karikh 3 years ago
parent
commit
56b360126a

+ 1
- 1
extensions/enabled/_50_add_mistral_panel.py View File

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

+ 1
- 1
karma-unit.conf.js View File

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

+ 0
- 4212
merlin/static/merlin/js/custom-libs/ui-bootstrap-tpls-0.12.0.js
File diff suppressed because it is too large
View File


merlin/static/merlin/js/custom-libs/ui-bootstrap-tpls-0.13.0.patched.js
File diff suppressed because it is too large
View File


+ 1
- 4
merlin/test/js/merlin.directives.spec.js View File

@@ -109,8 +109,7 @@ describe('merlin directives', function() {
109 109
     it('starts as being expanded', function() {
110 110
       var panel = makePanelWithInnerTags(),
111 111
         body = getPanelBody(panel);
112
-
113
-      expect(body.hasClass('collapse')).toBe(true);
112
+        
114 113
       expect(body.hasClass('in')).toBe(true);
115 114
     });
116 115
 
@@ -167,7 +166,6 @@ describe('merlin directives', function() {
167 166
       var element = makeGroupWithInnerTags(),
168 167
         body = getGroupBody(element);
169 168
 
170
-      expect(body.hasClass('collapse')).toBe(true);
171 169
       expect(body.hasClass('in')).toBe(true);
172 170
     });
173 171
 
@@ -181,7 +179,6 @@ describe('merlin directives', function() {
181 179
 
182 180
       link.triggerHandler('click');
183 181
 
184
-      expect(body.hasClass('collapse')).toBe(false);
185 182
       expect(body.hasClass('collapsing')).toBe(true);
186 183
     });
187 184
 

Loading…
Cancel
Save