deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1539 from NARKOZ/front-end

Browse source 
auto-complete for mentions in notes
This commit is contained in:
Dmitriy Zaporozhets 2012-09-24 06:02:34 -07:00
parent 6667f3dbf9 9c75fcbef1
commit 8ec956421c
5 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Gemfile
View file

@ -96,6 +96,7 @@ group :assets do
gem "therubyracer" gem "therubyracer"
gem 'chosen-rails' gem 'chosen-rails'
gem 'jquery-atwho-rails', '0.1.6'
gem "jquery-rails", "2.0.2" gem "jquery-rails", "2.0.2"
gem "jquery-ui-rails", "0.5.0" gem "jquery-ui-rails", "0.5.0"
gem "modernizr", "2.5.3" gem "modernizr", "2.5.3"

2
Gemfile.lock
View file

@ -199,6 +199,7 @@ GEM
httpauth (0.1) httpauth (0.1)
i18n (0.6.1) i18n (0.6.1)
journey (1.0.4) journey (1.0.4)
jquery-atwho-rails (0.1.6)
jquery-rails (2.0.2) jquery-rails (2.0.2)
railties (>= 3.2.0, < 5.0) railties (>= 3.2.0, < 5.0)
thor (~> 0.14) thor (~> 0.14)
@ -440,6 +441,7 @@ DEPENDENCIES
haml-rails haml-rails
headless headless
httparty httparty
jquery-atwho-rails (= 0.1.6)
jquery-rails (= 2.0.2) jquery-rails (= 2.0.2)
jquery-ui-rails (= 0.5.0) jquery-ui-rails (= 0.5.0)
kaminari kaminari

1
app/assets/javascripts/application.js
View file

@ -11,6 +11,7 @@
//= require jquery.endless-scroll //= require jquery.endless-scroll
//= require jquery.highlight //= require jquery.highlight
//= require jquery.waitforimages //= require jquery.waitforimages
//= require jquery.atwho
//= require bootstrap //= require bootstrap
//= require modernizr //= require modernizr
//= require chosen-jquery //= require chosen-jquery

1
app/assets/stylesheets/application.css
View file

@ -4,6 +4,7 @@
* the top of the compiled file, but it's generally better to create a new file per style scope. * the top of the compiled file, but it's generally better to create a new file per style scope.
*= require jquery.ui.all *= require jquery.ui.all
*= require jquery.ui.aristo *= require jquery.ui.aristo
*= require jquery.atwho
*= require chosen *= require chosen
*= require_self *= require_self
*= require main *= require main

5
app/views/notes/_common_form.html.haml
View file

@ -37,3 +37,8 @@
= f.file_field :attachment, class: "input-file" = f.file_field :attachment, class: "input-file"
%span.hint Any file less than 10 MB %span.hint Any file less than 10 MB
:javascript
$(function(){
var names = #{@project.users.pluck(:name)};
$('.note-text').atWho('@', { data: names });
});