فهرست منبع

fixed string replace issue that caused problems, this removes build cache busting in requirejs, will need to fix that later

Torkel Ödegaard 11 سال پیش
والد
کامیت
c22c4b864c
2فایلهای تغییر یافته به همراه3 افزوده شده و 7 حذف شده
  1. 1 1
      src/app/app.js
  2. 2 6
      tasks/build_task.js

+ 1 - 1
src/app/app.js

@@ -26,7 +26,7 @@ function (angular, $, _, appLevelRequire) {
     // features if we define them after boot time
     register_fns = {};
 
-  // // This stores the Kibana revision number, @REV@ is replaced by grunt.
+  // This stores the grafana version number
   app.constant('grafanaVersion',"@grafanaVersion@");
 
   // Use this for cache busting partials

+ 2 - 6
tasks/build_task.js

@@ -26,15 +26,11 @@ module.exports = function(grunt) {
         options: {
           replacements: [
             {
-              pattern: /(?:^|\/\/)(.*)@REV@/,
-              replacement: '$1'+desc.object
-            },
-            {
-              pattern: /@REV@/,
+              pattern: /@REV@/g,
               replacement: desc.object
             },
             {
-              pattern: /@grafanaVersion@/,
+              pattern: /@grafanaVersion@/g,
               replacement: 'v<%= pkg.version %>'
             }
           ]