Преглед изворни кода

Small js warning fix for firefox

Torkel Ödegaard пре 11 година
родитељ
комит
c6812f569f
2 измењених фајлова са 3 додато и 2 уклоњено
  1. 1 1
      src/app/partials/dashboard_topnav.html
  2. 2 1
      src/vendor/bootstrap/bootstrap.js

+ 1 - 1
src/app/partials/dashboard_topnav.html

@@ -22,7 +22,7 @@
 				</li>
 				</li>
 
 
 				<li class="dropdown grafana-menu-save">
 				<li class="dropdown grafana-menu-save">
-					<a href="#"  bs-tooltip="'Save'" data-placement="bottom" class="dropdown-toggle" data-toggle="dropdown" ng-click="openSaveDropdown()">
+					<a bs-tooltip="'Save'" data-placement="bottom" class="dropdown-toggle" data-toggle="dropdown" ng-click="openSaveDropdown()">
 						<i class='icon-save'></i>
 						<i class='icon-save'></i>
 					</a>
 					</a>
 
 

+ 2 - 1
src/vendor/bootstrap/bootstrap.js

@@ -753,7 +753,8 @@
 
 
     if (!selector) {
     if (!selector) {
       selector = $this.attr('href')
       selector = $this.attr('href')
-      selector = selector && /#/.test(selector) && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
+      // grafana backport fix from bootstrap 3
+      selector = selector && /#[A-Za-z]/.test(selector) && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
     }
     }
 
 
     $parent = selector && $(selector)
     $parent = selector && $(selector)