Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Removed dumb javascript translations variables: hard to maintain, clu…

…msy and useless.

Not best practice anyway.
  • Loading branch information...
commit a8a5270454865fa7cc171c3fa612123c1a21fb70 1 parent cfc0fa0
@bbenezech authored
View
7 lib/papermill/papermill_helper.rb
@@ -9,12 +9,9 @@ module PapermillHelper
def papermill_javascript_tag(options = {})
html = []
- html << %{<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.1/jquery.min.js" type="text/javascript"></script>\
- <script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.7.2/jquery-ui.min.js" type="text/javascript"></script>} if options[:with_jquery]
+ html << %{<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js" type="text/javascript"></script>\
+ <script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.2/jquery-ui.min.js" type="text/javascript"></script>} if options[:with_jquery]
html << %{<script type="text/javascript">}
- ["SWFUPLOAD_PENDING", "SWFUPLOAD_LOADING"].each do |js_constant|
- html << %{var #{escape_javascript js_constant} = "#{t("papermill.#{escape_javascript js_constant}")}";}
- end
html << %{jQuery.noConflict();} if options[:with_jquery].to_s == "no_conflict"
html << %{</script>}
html << javascript_include_tag("/facebox/facebox.js", "/jgrowl/jquery.jgrowl_minimized.js", "/Jcrop/jquery.Jcrop.min.js", "/swfupload/swfupload.js", "/papermill/papermill.js", :cache => "papermill")
View
2  public/papermill/papermill.js
@@ -69,7 +69,6 @@ var Papermill = {
jQuery(this.sorted_queue).each( function(index, file) {
div = jQuery('<div></div>').attr({ 'id': file.id, 'class': 'swfupload asset' });
div.append(jQuery('<span></span>').attr('class', 'name').html(file.name.substring(0, 10) + '...'));
- div.append(jQuery('<span></span>').attr('class', 'status').html(SWFUPLOAD_PENDING));
div.append(jQuery('<span></span>').attr('class', 'progress').append('<span></span>'));
if(self.settings.file_queue_limit == 1) {
old_asset = jQuery("#" + self.settings.upload_id).children()[0];
@@ -84,7 +83,6 @@ var Papermill = {
},
upload_start: function(file)
{
- jQuery('#' + file.id + ' .status').html(SWFUPLOAD_LOADING);
this.addFileParam(file.id, "Fileid", file.id);
if(this.settings.file_queue_limit == 1) {
old_asset = jQuery("#" + this.settings.upload_id).children()[0];
Please sign in to comment.
Something went wrong with that request. Please try again.