diff options
| author | Rob Crittenden <rcritten@redhat.com> | 2010-08-31 16:50:01 -0400 |
|---|---|---|
| committer | Rob Crittenden <rcritten@redhat.com> | 2010-08-31 16:50:01 -0400 |
| commit | 99399cc7073204bb125d0f8c848ae9e1ab9b334f (patch) | |
| tree | c439d926af023e0ee10b58f09f1e6dda4b619606 | |
| parent | 75aafb8d0f053cb30bb78d9f86e0dc84d0d106de (diff) | |
| parent | b7607817ab94361b14e9d565775bd5da76d2b115 (diff) | |
| download | freeipa-99399cc7073204bb125d0f8c848ae9e1ab9b334f.tar.gz freeipa-99399cc7073204bb125d0f8c848ae9e1ab9b334f.tar.xz freeipa-99399cc7073204bb125d0f8c848ae9e1ab9b334f.zip | |
Merge branch 'master' of ssh://rcritten@git.fedorahosted.org/git/freeipa
| -rw-r--r-- | install/static/index.xhtml | 9 | ||||
| -rw-r--r-- | install/static/ipa.js | 2 | ||||
| -rw-r--r-- | install/static/sampledata/develop.js | 3 |
3 files changed, 2 insertions, 12 deletions
diff --git a/install/static/index.xhtml b/install/static/index.xhtml index 489f192b6..8e231f455 100644 --- a/install/static/index.xhtml +++ b/install/static/index.xhtml @@ -7,17 +7,8 @@ <script type="text/javascript" src="jquery.js"></script> <script type="text/javascript" src="jquery.cookie.js"></script> - - <script type="text/javascript"> - /* the develop.js file that follows will set this to true. - that file should only exist in the source file system - and should not get deployed to the web server */ - var useSampleData = false; - </script> - <script type="text/javascript" src="ipa.js"></script> <script type="text/javascript" src="navigation.js"></script> - <script type="text/javascript" src="sampledata/develop.js"></script> <script type="text/javascript" src="search.js"></script> <script type="text/javascript" src="details.js"></script> <script type="text/javascript" src="add.js"></script> diff --git a/install/static/ipa.js b/install/static/ipa.js index fd93c1a30..63101a710 100644 --- a/install/static/ipa.js +++ b/install/static/ipa.js @@ -35,6 +35,8 @@ var _ipa_init_on_win_callback = null; var qs; +var useSampleData = (window.location.protocol == "file:"); + function ipa_init(url, on_win) { diff --git a/install/static/sampledata/develop.js b/install/static/sampledata/develop.js deleted file mode 100644 index 5c5275b5b..000000000 --- a/install/static/sampledata/develop.js +++ /dev/null @@ -1,3 +0,0 @@ -//This should not be packaged up, and so we should only get a true value when working inside the file system -useSampleData = true; - |