Kaynağa Gözat

Somehow missed that tooltips were broken, caused by jquery defining itself using the 'jquery' name, which prevented our custom module from being included and extending jquery.

Spencer Alger 12 yıl önce
ebeveyn
işleme
2a1c67ffdb

Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 1
dist/app/app.js


+ 2 - 2
dist/app/components/require.config.js

@@ -1,4 +1,4 @@
-/*! kibana - v3.0.0m3pre - 2013-09-13
+/*! kibana - v3.0.0m3pre - 2013-09-14
  * Copyright (c) 2013 Rashid Khan; Licensed Apache License */
 
-require.config({baseUrl:"app",paths:{config:"../config",settings:"components/settings",kbn:"components/kbn",css:"../vendor/require/css",text:"../vendor/require/text",moment:"../vendor/moment",filesaver:"../vendor/filesaver",angular:"../vendor/angular/angular","angular-strap":"../vendor/angular/angular-strap","angular-sanitize":"../vendor/angular/angular-sanitize",timepicker:"../vendor/angular/timepicker",datepicker:"../vendor/angular/datepicker",underscore:"components/underscore.extended","underscore-src":"../vendor/underscore",bootstrap:"../vendor/bootstrap/bootstrap",jquery:"components/jquery.extended","jquery-src":"../vendor/jquery/jquery-1.8.0","jquery.flot":"../vendor/jquery/jquery.flot","jquery.flot.pie":"../vendor/jquery/jquery.flot.pie","jquery.flot.selection":"../vendor/jquery/jquery.flot.selection","jquery.flot.stack":"../vendor/jquery/jquery.flot.stack","jquery.flot.time":"../vendor/jquery/jquery.flot.time",modernizr:"../vendor/modernizr-2.6.1",elasticjs:"../vendor/elasticjs/elastic-angular-client"},shim:{underscore:{exports:"_"},angular:{deps:["jquery"],exports:"angular"},bootstrap:{deps:["jquery"]},modernizr:{exports:"Modernizr"},"jquery-src":{exports:"jQuery"},"jquery.flot":["jquery"],"jquery.flot.pie":["jquery","jquery.flot"],"jquery.flot.selection":["jquery","jquery.flot"],"jquery.flot.stack":["jquery","jquery.flot"],"jquery.flot.time":["jquery","jquery.flot"],"angular-sanitize":["angular"],"angular-cookies":["angular"],"angular-loader":["angular"],"angular-mocks":["angular"],"angular-resource":["angular"],"angular-route":["angular"],"angular-touch":["angular"],"angular-strap":["angular","bootstrap","timepicker","datepicker"],timepicker:["jquery","bootstrap"],datepicker:["jquery","bootstrap"],elasticjs:["angular","../vendor/elasticjs/elastic"]}});
+require.config({baseUrl:"app",paths:{config:"../config",settings:"components/settings",kbn:"components/kbn",css:"../vendor/require/css",text:"../vendor/require/text",moment:"../vendor/moment",filesaver:"../vendor/filesaver",angular:"../vendor/angular/angular","angular-strap":"../vendor/angular/angular-strap","angular-sanitize":"../vendor/angular/angular-sanitize",timepicker:"../vendor/angular/timepicker",datepicker:"../vendor/angular/datepicker",underscore:"components/underscore.extended","underscore-src":"../vendor/underscore",bootstrap:"../vendor/bootstrap/bootstrap",jquery:"components/jquery.extended","jquery-src":"../vendor/jquery/jquery-1.8.0","jquery.flot":"../vendor/jquery/jquery.flot","jquery.flot.pie":"../vendor/jquery/jquery.flot.pie","jquery.flot.selection":"../vendor/jquery/jquery.flot.selection","jquery.flot.stack":"../vendor/jquery/jquery.flot.stack","jquery.flot.time":"../vendor/jquery/jquery.flot.time",modernizr:"../vendor/modernizr-2.6.1",elasticjs:"../vendor/elasticjs/elastic-angular-client"},shim:{underscore:{exports:"_"},angular:{deps:["jquery"],exports:"angular"},bootstrap:{deps:["jquery"]},modernizr:{exports:"Modernizr"},"jquery-src":{init:function(a){return function(){var b=a.jQuery;return require.undef("jquery"),b}}(this)},"jquery.flot":["jquery"],"jquery.flot.pie":["jquery","jquery.flot"],"jquery.flot.selection":["jquery","jquery.flot"],"jquery.flot.stack":["jquery","jquery.flot"],"jquery.flot.time":["jquery","jquery.flot"],"angular-sanitize":["angular"],"angular-cookies":["angular"],"angular-loader":["angular"],"angular-mocks":["angular"],"angular-resource":["angular"],"angular-route":["angular"],"angular-touch":["angular"],"angular-strap":["angular","bootstrap","timepicker","datepicker"],timepicker:["jquery","bootstrap"],datepicker:["jquery","bootstrap"],elasticjs:["angular","../vendor/elasticjs/elastic"]}});

+ 1 - 1
dist/app/dashboards/logstash.js

@@ -137,7 +137,7 @@ dashboard.rows[0].panels = [
 // Add a filtering panel to the 3rd row
 dashboard.rows[1].panels = [
   {
-    type: 'Query'
+    type: 'query'
   }
 ];
 

+ 1 - 1
dist/app/panels/bettermap/leaflet.amd.js

@@ -1,3 +1,3 @@
-/*! kibana - v3.0.0m3pre - 2013-09-13
+/*! kibana - v3.0.0m3pre - 2013-09-14
  * Copyright (c) 2013 Rashid Khan; Licensed Apache License */
 

Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 1
dist/app/panels/bettermap/leaflet/leaflet.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 1
dist/app/panels/bettermap/leaflet/plugins.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 1
dist/app/panels/bettermap/module.js


+ 1 - 1
dist/app/panels/column/module.js

@@ -1,4 +1,4 @@
-/*! kibana - v3.0.0m3pre - 2013-09-13
+/*! kibana - v3.0.0m3pre - 2013-09-14
  * Copyright (c) 2013 Rashid Khan; Licensed Apache License */
 
 define("panels/column/module",["angular","app","underscore","config"],function(a,b,c,d){var e=a.module("kibana.panels.column",[]);b.useModule(e),e.controller("column",["$scope","$rootScope","$timeout",function(a,b,d){a.panelMeta={status:"Stable",description:"A pseudo panel that lets you add other panels to be arranged in a column withdefined heights."};var e={panels:[]};c.defaults(a.panel,e),a.init=function(){a.reset_panel()},a.toggle_row=function(b){b.collapse=b.collapse?!1:!0,b.collapse||d(function(){a.send_render()})},a.send_render=function(){a.$broadcast("render")},a.add_panel=function(b){a.panel.panels.push(b)},a.reset_panel=function(b){a.new_panel={loading:!1,error:!1,sizeable:!1,span:12,height:"150px",editable:!0,type:b}}}]),e.directive("columnEdit",["$compile","$timeout",function(b,d){return{scope:{new_panel:"=panel",row:"=",config:"=",dashboards:"=",type:"=type"},link:function(e,f){e.$on("render",function(){d(function(){e.panel=e.new_panel;var d="<div ng-include src=\"partial('panelgeneral')\"></div>";c.isUndefined(e.type)||""===e.type||(d=d+"<div ng-include src=\"'app/panels/"+e.type+"/editor.html'\"></div>"),f.html(b(a.element(d))(e))})})}}}]),e.filter("withoutColumn",function(){return function(){return c.without(d.panel_names,"column")}})});

Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 1
dist/app/panels/dashcontrol/module.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 1
dist/app/panels/derivequeries/module.js


+ 1 - 1
dist/app/panels/fields/module.js

@@ -1,4 +1,4 @@
-/*! kibana - v3.0.0m3pre - 2013-09-13
+/*! kibana - v3.0.0m3pre - 2013-09-14
  * Copyright (c) 2013 Rashid Khan; Licensed Apache License */
 
 define("panels/fields/module",["angular","app","underscore"],function(a,b,c){var d=a.module("kibana.panels.fields",[]);b.useModule(d),d.controller("fields",["$scope",function(a){a.panelMeta={status:"Deprecated",description:"You should not use this table, it does not work anymore. The table panel nowintegrates a field selector. This module will soon be removed."};var b={style:{},arrange:"vertical",micropanel_position:"right"};c.defaults(a.panel,b),a.init=function(){}}])});

+ 1 - 1
dist/app/panels/filtering/module.js

@@ -1,4 +1,4 @@
-/*! kibana - v3.0.0m3pre - 2013-09-13
+/*! kibana - v3.0.0m3pre - 2013-09-14
  * Copyright (c) 2013 Rashid Khan; Licensed Apache License */
 
 define("panels/filtering/module",["angular","app","underscore"],function(a,b,c){var d=a.module("kibana.panels.filtering",[]);b.useModule(d),d.controller("filtering",["$scope","filterSrv","$rootScope","dashboard",function(a,b,d,e){a.panelMeta={status:"Beta",description:"A controllable list of all filters currently applied to the dashboard. You almost certainly want one of these on your dashboard somewhere."};var f={};c.defaults(a.panel,f),a.init=function(){a.filterSrv=b},a.remove=function(a){b.remove(a),e.refresh()},a.toggle=function(a){b.list[a].active=!b.list[a].active,e.refresh()},a.refresh=function(){d.$broadcast("refresh")},a.render=function(){d.$broadcast("render")},a.show_key=function(a){return!c.contains(["type","id","alias","mandate","active","editing"],a)},a.isEditable=function(a){var b=["time"];return c.contains(b,a.type)?!1:!0}}])});

Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 1
dist/app/panels/histogram/module.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 1
dist/app/panels/hits/module.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 1
dist/app/panels/map/lib/map.europe.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 1
dist/app/panels/map/lib/map.usa.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 1
dist/app/panels/map/lib/map.world.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 1
dist/app/panels/map/module.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 1
dist/app/panels/pie/module.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 1
dist/app/panels/query/module.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 1
dist/app/panels/table/module.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 1
dist/app/panels/terms/module.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 1
dist/app/panels/text/module.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 1
dist/app/panels/timepicker/module.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 1
dist/app/panels/trends/module.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 1
dist/vendor/filesaver.js


+ 1 - 1
dist/vendor/require/css-build.js

@@ -1,4 +1,4 @@
-/*! kibana - v3.0.0m3pre - 2013-09-13
+/*! kibana - v3.0.0m3pre - 2013-09-14
  * Copyright (c) 2013 Rashid Khan; Licensed Apache License */
 
 define(function(){function a(a,b){var d=c.readFileSync(a,"utf8");0===d.indexOf("")&&(d=d.substring(1)),b(d)}function b(a){return a.replace(/[\r\n]+/g," ").replace(/[\t]/g," ")}var c=require.nodeRequire("fs"),d={},e=!1,f={load:function(c,e,f,g){f(!0),a(g.baseUrl+c,function(a){d[c]=b(a)})},write:function(a,b,c){e||(e=!0,c("define('"+a+"-embed', function()\n{\n"+"	function embed_css(content)\n"+"	{\n"+"		var head = document.getElementsByTagName('head')[0],\n"+"		style = document.createElement('style'),\n"+"		rules = document.createTextNode(content);\n"+"		style.type = 'text/css';\n"+"		if(style.styleSheet)\n"+"			style.styleSheet.cssText = rules.nodeValue;\n"+"		else style.appendChild(rules);\n"+"			head.appendChild(style);\n"+"	}\n"+"	return embed_css;\n"+"});\n")),c("define('"+a+"!"+b+"', ['"+a+"-embed'], \n"+"function(embed)\n{\n"+"	embed(\n	'"+d[b].replace(/'/g,"\\'")+"'\n	);\n"+"	return true;\n"+"});\n")},writeFile:function(){},onLayerEnd:function(){}};return f});

Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 1
dist/vendor/require/require.js


+ 1 - 1
dist/vendor/require/tmpl.js

@@ -1,4 +1,4 @@
-/*! kibana - v3.0.0m3pre - 2013-09-13
+/*! kibana - v3.0.0m3pre - 2013-09-14
  * Copyright (c) 2013 Rashid Khan; Licensed Apache License */
 
 define(["module"],function(a){var b=a.config&&a.config()||{};return{load:function(a,c,d){var e=c.toUrl(a);c(["text!"+a],function(a){b.registerTemplate&&b.registerTemplate(e,a),d(a)})}}});

Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 1
dist/vendor/timezone.js


+ 10 - 2
src/app/components/require.config.js

@@ -55,8 +55,16 @@ require.config({
     },
 
     'jquery-src': {
-      // requiring should work, but isn't required
-      exports: 'jQuery'
+      init: (function (global) {
+        'use strict';
+        return function () {
+          var jQuery = global.jQuery;
+          // jquery defines itself, but we want to extend it and provide our version as the 'jquery'
+          // package
+          require.undef('jquery');
+          return jQuery;
+        };
+      })(this)
     },
 
     // simple dependency declatation

Bu fark içinde çok fazla dosya değişikliği olduğu için bazı dosyalar gösterilmiyor