Skip to content

Commit

Permalink
Merge remote-tracking branch 'amb26/FLUID-4429'
Browse files Browse the repository at this point in the history
* amb26/FLUID-4429:
  FLUID-4429: Restoring three demo path renames that went to my FLUID-4370 branch by mistake
  • Loading branch information
michelled committed Sep 7, 2011
2 parents c998d2b + 0e3ec65 commit 05fb4ee
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/webapp/demos/inlineEdit/simple/html/inlineEdit.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<script type="text/javascript" src="../../../../components/inlineEdit/js/InlineEdit.js"></script>
<script type="text/javascript" src="../../../../components/undo/js/Undo.js"></script>

<script type="text/javascript" src="../js/inlineEdit.js"></script>
<script type="text/javascript" src="../js/inlineEditDemo.js"></script>

<title>Inline Edit Demo</title>
</head>
Expand Down
5 changes: 3 additions & 2 deletions src/webapp/demos/renderer/html/renderer.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,9 @@
<script type="text/javascript" src="../../../lib/fastXmlPull/js/fastXmlPull.js"></script>
<script type="text/javascript" src="../../../framework/renderer/js/fluidParser.js"></script>
<script type="text/javascript" src="../../../framework/renderer/js/fluidRenderer.js"></script>
<script type="text/javascript" src="../data/renderer.js"></script>
<script type="text/javascript" src="../js/renderer.js"></script>

<script type="text/javascript" src="../data/rendererDemoData.js"></script>
<script type="text/javascript" src="../js/rendererDemo.js"></script>
</head>

<body class="fl-font-sans fl-focus">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<script type="text/javascript" src="../../../../components/reorderer/js/GeometricManager.js"></script>
<script type="text/javascript" src="../../../../components/reorderer/js/Reorderer.js"></script>

<script type="text/javascript" src="../js/listReorderer.js"></script>
<script type="text/javascript" src="../js/listReordererDemo.js"></script>
</head>

<body>
Expand Down

0 comments on commit 05fb4ee

Please sign in to comment.