Merge branch 'master' of ssh://rcritten@git.fedorahosted.org/git/freeipa

This commit is contained in:
Rob Crittenden 2010-08-31 16:50:01 -04:00
commit 99399cc707
3 changed files with 2 additions and 12 deletions

View File

@ -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>

View File

@ -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)
{

View File

@ -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;