Merge branch 'feature/turbolinks' of /home/git/repositories/gitlab/gitlabhq

Dmitriy Zaporozhets
2 parents fbb7cd8b de7d6431
Showing 5 changed files with 23 additions and 0 deletions Show diff stats
Gemfile
Gemfile.lock
app/assets/javascripts/application.js
app/assets/javascripts/main.js.coffee
app/views/layouts/_head_panel.html.haml
@@ -105,6 +105,8 @@ group :assets do
   gem "coffee-rails", "~> 3.2.2"
   gem "uglifier",     "~> 1.3.0"
   gem "therubyracer"
+  gem 'turbolinks'
+  gem 'jquery-turbolinks'
  
   gem 'chosen-rails',     "0.9.8"
   gem 'select2-rails'
@@ -232,6 +232,9 @@ GEM
     jquery-rails (2.1.3)
       railties (>= 3.1.0, < 5.0)
       thor (~> 0.14)
+    jquery-turbolinks (1.0.0)
+      railties (>= 3.1.0)
+      turbolinks
     jquery-ui-rails (2.0.2)
       jquery-rails
       railties (>= 3.1.0)
@@ -461,6 +464,8 @@ GEM
     treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
+    turbolinks (1.1.1)
+      coffee-rails
     tzinfo (0.3.37)
     uglifier (1.3.0)
       execjs (>= 0.3.0)
@@ -521,6 +526,7 @@ DEPENDENCIES
   httparty
   jquery-atwho-rails (= 0.1.7)
   jquery-rails (= 2.1.3)
+  jquery-turbolinks
   jquery-ui-rails (= 2.0.2)
   kaminari (~> 0.14.1)
   launchy
@@ -564,5 +570,6 @@ DEPENDENCIES
   test_after_commit
   therubyracer
   thin
+  turbolinks
   uglifier (~> 1.3.0)
   webmock
@@ -14,6 +14,8 @@
 //= require jquery.waitforimages
 //= require jquery.atwho
 //= require jquery.scrollto
+//= require turbolinks
+//= require jquery.turbolinks
 //= require bootstrap
 //= require modernizr
 //= require chosen-jquery
@@ -41,6 +41,14 @@ window.linkify = (str) -&gt;
   exp = /(\b(https?|ftp|file):\/\/[-A-Z0-9+&@#\/%?=~_|!:,.;]*[-A-Z0-9+&@#\/%=~_|])/ig
   return str.replace(exp,"<a href='$1'>$1</a>")
  
+window.startSpinner = ->
+  $('.turbolink-spinner').fadeIn()
+
+window.stopSpinner = ->
+  $('.turbolink-spinner').fadeOut()
+
+document.addEventListener("page:fetch", startSpinner)
+document.addEventListener("page:receive", stopSpinner)
  
 $ ->
   # Click a .one_click_select field, select the contents
@@ -9,6 +9,10 @@
       %h1.project_name= title
       %ul.nav
         %li
+          %a
+            %div.hide.turbolink-spinner
+              %i.icon-refresh.icon-spin
+        %li
           = render "layouts/search"
         %li
           = link_to public_root_path, title: "Public area", class: 'has_bottom_tooltip', 'data-original-title' => 'Public area' do
...	...	@@ -105,6 +105,8 @@ group :assets do
105	105	gem "coffee-rails", "~> 3.2.2"
106	106	gem "uglifier", "~> 1.3.0"
107	107	gem "therubyracer"
	108	+ gem 'turbolinks'
	109	+ gem 'jquery-turbolinks'
108	110
109	111	gem 'chosen-rails', "0.9.8"
110	112	gem 'select2-rails'
...	...
...	...	@@ -232,6 +232,9 @@ GEM
232	232	jquery-rails (2.1.3)
233	233	railties (>= 3.1.0, < 5.0)
234	234	thor (~> 0.14)
	235	+ jquery-turbolinks (1.0.0)
	236	+ railties (>= 3.1.0)
	237	+ turbolinks
235	238	jquery-ui-rails (2.0.2)
236	239	jquery-rails
237	240	railties (>= 3.1.0)
...	...	@@ -461,6 +464,8 @@ GEM
461	464	treetop (1.4.12)
462	465	polyglot
463	466	polyglot (>= 0.3.1)
	467	+ turbolinks (1.1.1)
	468	+ coffee-rails
464	469	tzinfo (0.3.37)
465	470	uglifier (1.3.0)
466	471	execjs (>= 0.3.0)
...	...	@@ -521,6 +526,7 @@ DEPENDENCIES
521	526	httparty
522	527	jquery-atwho-rails (= 0.1.7)
523	528	jquery-rails (= 2.1.3)
	529	+ jquery-turbolinks
524	530	jquery-ui-rails (= 2.0.2)
525	531	kaminari (~> 0.14.1)
526	532	launchy
...	...	@@ -564,5 +570,6 @@ DEPENDENCIES
564	570	test_after_commit
565	571	therubyracer
566	572	thin
	573	+ turbolinks
567	574	uglifier (~> 1.3.0)
568	575	webmock
...	...
...	...	@@ -14,6 +14,8 @@
14	14	//= require jquery.waitforimages
15	15	//= require jquery.atwho
16	16	//= require jquery.scrollto
	17	+//= require turbolinks
	18	+//= require jquery.turbolinks
17	19	//= require bootstrap
18	20	//= require modernizr
19	21	//= require chosen-jquery
...	...
...	...	@@ -41,6 +41,14 @@ window.linkify = (str) ->
41	41	exp = /(\b(https?\|ftp\|file):\/\/[-A-Z0-9+&@#\/%?=~_\|!:,.;]*[-A-Z0-9+&@#\/%=~_\|])/ig
42	42	return str.replace(exp,"<a href='$1'>$1</a>")
43	43
	44	+window.startSpinner = ->
	45	+ $('.turbolink-spinner').fadeIn()
	46	+
	47	+window.stopSpinner = ->
	48	+ $('.turbolink-spinner').fadeOut()
	49	+
	50	+document.addEventListener("page:fetch", startSpinner)
	51	+document.addEventListener("page:receive", stopSpinner)
44	52
45	53	$ ->
46	54	# Click a .one_click_select field, select the contents
...	...
...	...	@@ -9,6 +9,10 @@
9	9	%h1.project_name= title
10	10	%ul.nav
11	11	%li
	12	+ %a
	13	+ %div.hide.turbolink-spinner
	14	+ %i.icon-refresh.icon-spin
	15	+ %li
12	16	= render "layouts/search"
13	17	%li
14	18	= link_to public_root_path, title: "Public area", class: 'has_bottom_tooltip', 'data-original-title' => 'Public area' do
...	...