Changed name off config.js to config.sample.js to make it easier to u…

…pgrade with having to worry about config being overwwritten, if there is no config.js file config.sample.js will be read instead (requirejs fallback). Closes grafana#65
rsecar · Feb 6, 2014 · f2f435b · f2f435b
1 parent 0015f81
commit f2f435b
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,5 +2,5 @@ node_modules
 .aws-config.json
 dist
 web.config
-config.dev.js
+config.js
 *.sublime-workspace
diff --git a/package.json b/package.json
@@ -4,7 +4,7 @@
     "company": "Coding Instinct AB"
   },
   "name": "grafana",
-  "version": "1.0.4",
+  "version": "1.1.0",
   "repository": {
     "type": "git",
     "url": "http://github.com/torkelo/grafana.git"

diff --git a/src/app/components/require.config.js b/src/app/components/require.config.js
@@ -5,7 +5,7 @@ require.config({
   baseUrl: 'app',
   // urlArgs: 'r=@REV@',
   paths: {
-    config:                   '../config',
+    config:                   ['../config', '../config.sample'],
     settings:                 'components/settings',
     kbn:                      'components/kbn',
 

diff --git a/src/config.js → src/config.sample.js b/src/config.js → src/config.sample.js