From 7d56a51bdcffa2413a68779e4899e8139c1ba4f9 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Mon, 26 Mar 2012 21:41:58 +0300 Subject: [PATCH] Js refactoring and ajax animation replaced --- app/assets/images/ajax-loader-facebook.gif | Bin 723 -> 0 bytes app/assets/images/ajax-loader.gif | Bin 4178 -> 0 bytes app/assets/images/ajax_loader.gif | Bin 0 -> 7542 bytes app/assets/javascripts/application.js | 4 +++ app/assets/javascripts/merge_requests.js | 4 ++- app/assets/javascripts/projects.js | 14 ++++++++++ app/assets/stylesheets/common.scss | 2 +- app/views/issues/index.html.haml | 2 +- app/views/merge_requests/show.html.haml | 3 +- app/views/projects/_form.html.haml | 2 +- app/views/projects/create.js.haml | 1 + app/views/projects/edit.html.haml | 31 +++++---------------- app/views/projects/new.html.haml | 31 +++++---------------- app/views/projects/update.js.haml | 1 + 14 files changed, 41 insertions(+), 54 deletions(-) delete mode 100644 app/assets/images/ajax-loader-facebook.gif delete mode 100644 app/assets/images/ajax-loader.gif create mode 100644 app/assets/images/ajax_loader.gif create mode 100644 app/assets/javascripts/projects.js diff --git a/app/assets/images/ajax-loader-facebook.gif b/app/assets/images/ajax-loader-facebook.gif deleted file mode 100644 index 6350e5f45b6ca1b85adf013a46d2f258b2f1928e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 723 zcmZ?wbhEHb6kyE<)vMU#?3B#H;E1HBPoDv~r_Y?5Hgn$UbsG!IYA;{8 zx^wrw36p28SiL^Kxcb7y%g>)b-@bECSaeE!N{(+(%+X^fV-mCcLSjoQ8=BgB(sN1z z!r~cVK=D7fpKD04vtxj(k)8oFBT!uNpOkY^YGO%hib8p2NrpmVR$@g?eqxGVW?ou8 zgW^vXPHvzo9gqniM>4SLDk$`&WX@Z%fa}pIrgaVi%@$`&3ocjRyS-yRANv!*_AQSb zPVndzue-+Ox^|iqHWO455+zs@=B>z-X`i_7z^y|o-&|VW`~1z`*SjP1HRiB3S_^hc zFk#bZ2DG|6QRi`o3a643Px6waMH(li&u{5{Z6tMII`e_1z0n^}cndb3y?A+tu;0u> zq1;*`)BFwzU^B`TXw(u8SHTdb-p3|MDxMc#+4KvaFRgrTJ&Sia^NAL_qz&%BMElQ7 zEVg8ks$6}odzaSSAVq8@89~D1+NOwSE`gJGcw9;f3UxiXCH9e3+}mll8Pg8O2fk2d z>^<@91Z(mK7e88+X z-B+c5h6z)=E`yob=>_{91aV+wj;TDVWavt?S6F c!d97Iak>m9Y|fGEmtYMblFhINB@r+H0L=sflK=n! diff --git a/app/assets/images/ajax-loader.gif b/app/assets/images/ajax-loader.gif deleted file mode 100644 index c97ec6ea9739a68e25637c0aa4adaaea05e3e4ca..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4178 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 literal 0 HcmV?d00001 diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 85fb8e78..042bca91 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -70,3 +70,7 @@ function showMenu() { function resetMenu() { $(this).removeClass("hover"); } + +function slugify(text) { + return text.replace(/[^-a-zA-Z0-9]+/g, '_').toLowerCase(); +} diff --git a/app/assets/javascripts/merge_requests.js b/app/assets/javascripts/merge_requests.js index 96bc1ccb..b051928e 100644 --- a/app/assets/javascripts/merge_requests.js +++ b/app/assets/javascripts/merge_requests.js @@ -31,10 +31,12 @@ var MergeRequest = { $.ajax({ type: "GET", url: $(".merge-diffs-tab").attr("data-url"), + beforeSend: function(){ $('.status').addClass("loading")}, complete: function(){ MergeRequest.diffs_loaded = true; $(".merge_request_notes").hide(); - $(".dashboard-loader").hide()}, + $('.status').removeClass("loading"); + }, dataType: "script"}); } } diff --git a/app/assets/javascripts/projects.js b/app/assets/javascripts/projects.js new file mode 100644 index 00000000..84272698 --- /dev/null +++ b/app/assets/javascripts/projects.js @@ -0,0 +1,14 @@ +function Projects() { + $("#project_name").live("change", function(){ + var slug = slugify($(this).val()); + $("#project_code").val(slug); + $("#project_path").val(slug); + }); + + $('.new_project, .edit_project').live('ajax:before', function() { + $('.project_new_holder, .project_edit_holder').hide(); + $('.ajax_loader').show(); + }); + + $('form #project_default_branch').chosen(); +} diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index d785d4ff..eaf8e6af 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -589,7 +589,7 @@ table a code { .loading { margin:20px auto; - background: url(ajax-loader-facebook.gif) no-repeat center center; + background: url(ajax_loader.gif) no-repeat center center; width:40px; height:40px; } diff --git a/app/views/issues/index.html.haml b/app/views/issues/index.html.haml index 283e936e..7146027b 100644 --- a/app/views/issues/index.html.haml +++ b/app/views/issues/index.html.haml @@ -3,7 +3,7 @@ Issues %span.rss-icon = link_to project_issues_path(@project, :atom, { :private_token => current_user.private_token }) do - = image_tag "Rss-UI.PNG", :width => 22, :title => "feed" + = image_tag "Rss-UI.PNG", :width => 16, :title => "feed" - if can? current_user, :write_issue, @project = link_to new_project_issue_path(@project), :class => "right btn small", :title => "New Issue", :remote => true do diff --git a/app/views/merge_requests/show.html.haml b/app/views/merge_requests/show.html.haml index 4f1d49b8..88624a58 100644 --- a/app/views/merge_requests/show.html.haml +++ b/app/views/merge_requests/show.html.haml @@ -73,12 +73,11 @@ = link_to "#diffs", "data-url" => diffs_project_merge_request_path(@project, @merge_request), :class => "merge-diffs-tab tab" do Diff - %img{:src => "/assets/ajax-loader-facebook.gif", :class => "dashboard-loader"} .merge_request_notes#notes= render "notes/notes", :tid => @merge_request.id, :tt => "merge_request" .merge-request-diffs - +.status :javascript $(function(){ diff --git a/app/views/projects/_form.html.haml b/app/views/projects/_form.html.haml index 5d22f11d..8f6244f2 100644 --- a/app/views/projects/_form.html.haml +++ b/app/views/projects/_form.html.haml @@ -49,7 +49,7 @@ .clearfix = f.label :description .input - = f.text_area :description, :placeholder => "project description", :class => "xlarge", :rows => 4 + = f.text_area :description, :placeholder => "project description", :class => "xxlarge", :rows => 5 %p.hint Markdown is enabled. %br diff --git a/app/views/projects/create.js.haml b/app/views/projects/create.js.haml index 2b3106c8..80ca332d 100644 --- a/app/views/projects/create.js.haml +++ b/app/views/projects/create.js.haml @@ -3,5 +3,6 @@ location.href = "#{project_path(@project, :notice => 'Project was successfully created.')}"; - else :plain + $('.project_new_holder').show(); $("#new_project").replaceWith("#{escape_javascript(render('form'))}"); $('.ajax_loader').hide(); diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml index be8aae7d..53a0320b 100644 --- a/app/views/projects/edit.html.haml +++ b/app/views/projects/edit.html.haml @@ -1,29 +1,12 @@ = render "project_head" -%h3 Edit Project -%hr -= render "projects/form" -%div{ :class => "ajax_loader", :style => "display:none;height:200px;"} +.project_edit_holder + %h3 Edit Project + %hr + = render "projects/form" +%div.ajax_loader.hide %center - = image_tag "ajax-loader.gif", :class => "append-bottom" + %div.padded= image_tag "ajax_loader.gif" %h3.prepend-top Saving project & repository. Please wait... :javascript - $(function(){ - $("#project_name").live("change", function(){ - var slug = slugify($(this).val()); - $("#project_code").val(slug); - $("#project_path").val(slug); - }); - }); - - function slugify(text) { - return text.replace(/[^-a-zA-Z0-9]+/g, '_').toLowerCase(); - } - - $(function(){ - $('.edit_project').live('ajax:before', function() { - $(this).hide(); - $('.ajax_loader').show(); - }); - $('form #project_default_branch').chosen(); - }) + $(function(){ new Projects(); }); diff --git a/app/views/projects/new.html.haml b/app/views/projects/new.html.haml index 5883e7b8..3f3d51d0 100644 --- a/app/views/projects/new.html.haml +++ b/app/views/projects/new.html.haml @@ -1,28 +1,11 @@ -%h3 New Project -%hr -= render 'form' -%div{ :class => "ajax_loader", :style => "display:none;height:200px;"} +.project_new_holder + %h3 New Project + %hr + = render 'form' +%div.ajax_loader.hide %center - = image_tag "ajax-loader.gif", :class => "append-bottom" + %div.padded= image_tag "ajax_loader.gif" %h3.prepend-top Creating project & repository. Please wait for few minutes :javascript - $(function(){ - $("#project_name").live("change", function(){ - var slug = slugify($(this).val()); - $("#project_code").val(slug); - $("#project_path").val(slug); - }); - }); - - function slugify(text) { - return text.replace(/[^-a-zA-Z0-9]+/g, '_').toLowerCase(); - } - - $(function(){ - $('.new_project').live('ajax:before', function() { - $(this).hide(); - $('.ajax_loader').show(); - }); - $('form #project_default_branch').chosen(); - }) + $(function(){ new Projects(); }); diff --git a/app/views/projects/update.js.haml b/app/views/projects/update.js.haml index de12527e..ee0d3699 100644 --- a/app/views/projects/update.js.haml +++ b/app/views/projects/update.js.haml @@ -3,5 +3,6 @@ location.href = "#{edit_project_path(@project, :notice => 'Project was successfully updated.')}"; - else :plain + $('.project_edit_holder').show(); $(".edit_project").replaceWith("#{escape_javascript(render('form'))}"); $('.ajax_loader').hide();