Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

fixing nonconflict configuration

  • Loading branch information...
commit 36e6cdc750c7bb735d12a77a59355431dfa48a19 1 parent c9745ac
@Quimera Quimera authored
Showing with 8 additions and 5 deletions.
  1. +8 −5 src/collective/upload/viewlets/media_uploader_init.pt
View
13 src/collective/upload/viewlets/media_uploader_init.pt
@@ -1,9 +1,12 @@
<div id="multipleupload-code">
- <script src="++resource++collective.upload/jquery.1.7.1.js"></script>
<script>
- j$ = jQuery.noConflict();
- jQuery = $;
- </script>
+ var $_original = jQuery.noConflict();
+ </script>
+ <script src="++resource++collective.upload/jquery.1.7.1.js"></script>
+ <script>
+ var j$ = $;
+ $ = $_original;
+ </script>
<script src="++resource++collective.upload/jquery.ui.widget.js"></script>
<script src="++resource++collective.upload/load-image.min.js"></script>
@@ -11,5 +14,5 @@
<script src="++resource++collective.upload/jquery.fileupload.js"></script>
<script src="++resource++collective.upload/jquery.fileupload-ui.js"></script>
<script src="++resource++collective.upload/application.js"></script>
- <script src="++resource++collective.upload/media-upload-init-behavior.js"></script>
+ <script src="++resource++collective.upload/media-upload-init-behavior.js"></script>
</div>
Please sign in to comment.
Something went wrong with that request. Please try again.