github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 17:59:23 -04:00
Code Issues Projects Releases Packages Wiki Activity

[lodash] include the lodash-deep mixin

Browse source
This commit is contained in:
Spencer Alger 2014-12-11 18:23:47 -07:00
parent 83a9602623
commit 95a16005bc
3 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
bower.json
View file

@ -47,7 +47,8 @@
"ng-clip": "~0.2.4",
"require-css": "~0.1.2",
"requirejs": "~2.1.10",
"requirejs-text": "~2.0.10"
"requirejs-text": "~2.0.10",
"lodash-deep": "spenceralger/lodash-deep#k4"
},
"devDependencies": {}
}

1
src/kibana/require.config.js
View file

@ -29,6 +29,7 @@ require.config({
jquery: 'bower_components/jquery/dist/jquery',
leaflet: 'bower_components/leaflet/dist/leaflet',
lodash_src: 'bower_components/lodash/dist/lodash',
'lodash-deep': 'bower_components/lodash-deep/lodash-deep',
moment: 'bower_components/moment/moment',
'ng-clip': 'bower_components/ng-clip/src/ngClip',
text: 'bower_components/requirejs-text/text',

4
src/kibana/utils/_mixins.js
View file

@ -5,12 +5,12 @@ define(function (require) {
* use:
* var _ = require('lodash');
*
* require.js config points the "lodash" id to
* require.js config points the 'lodash' id to
* this module, which provides a modified version
* of lodash.
*/
var _ = require('lodash_src');
_.mixin(require('lodash-deep'));
_.mixin({
inherits: function (Sub, Super) {
Sub.prototype = _.create(Super.prototype, { 'constructor': Super });