Skip to content
Snippets Groups Projects
Commit 7d56a51b authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Js refactoring and ajax animation replaced

parent f1c534c6
No related branches found
No related tags found
No related merge requests found
Showing with 41 additions and 54 deletions
app/assets/images/ajax-loader-facebook.gif

723 B

app/assets/images/ajax-loader.gif

4.08 KiB

app/assets/images/ajax_loader.gif

7.37 KiB

Loading
Loading
@@ -70,3 +70,7 @@ function showMenu() {
function resetMenu() {
$(this).removeClass("hover");
}
function slugify(text) {
return text.replace(/[^-a-zA-Z0-9]+/g, '_').toLowerCase();
}
Loading
Loading
@@ -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"});
}
}
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();
}
Loading
Loading
@@ -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;
}
Loading
Loading
Loading
Loading
@@ -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
Loading
Loading
Loading
Loading
@@ -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(){
Loading
Loading
Loading
Loading
@@ -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
Loading
Loading
Loading
Loading
@@ -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();
= 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(); });
%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(); });
Loading
Loading
@@ -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();
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment