From f79b210061724fa1460fbb10853467182031c2c5 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Thu, 8 Aug 2013 11:40:42 +0300
Subject: [PATCH] Fix wiki popup for new page

---
 app/assets/javascripts/dispatcher.js.coffee | 4 +++-
 app/assets/javascripts/wikis.js.coffee      | 7 -------
 app/views/projects/wikis/_nav.html.haml     | 2 +-
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/app/assets/javascripts/dispatcher.js.coffee b/app/assets/javascripts/dispatcher.js.coffee
index d490233..b0b947d 100644
--- a/app/assets/javascripts/dispatcher.js.coffee
+++ b/app/assets/javascripts/dispatcher.js.coffee
@@ -39,7 +39,9 @@ class Dispatcher
 
     switch path.first()
       when 'admin' then new Admin()
-      when 'wikis' then new Wikis()
+      when 'projects'
+        new Wikis() if path[1] == 'wikis'
+
 
   initSearch: ->
     autocomplete_json = $('.search-autocomplete-json').data('autocomplete-opts')
diff --git a/app/assets/javascripts/wikis.js.coffee b/app/assets/javascripts/wikis.js.coffee
index f2867c8..17e790e 100644
--- a/app/assets/javascripts/wikis.js.coffee
+++ b/app/assets/javascripts/wikis.js.coffee
@@ -1,10 +1,5 @@
 class Wikis
   constructor: ->
-    modal = $('#modal-new-wiki').modal({modal: true, show:false})
-
-    $('.add-new-wiki').bind "click", ->
-      modal.show()
-
     $('.build-new-wiki').bind "click", ->
       field = $('#new_wiki_path')
       slug = field.val()
@@ -13,7 +8,5 @@ class Wikis
       if(slug.length > 0)
         location.href = path + "/" + slug
 
-    $('.modal-header .close').bind "click", ->
-      modal.hide()
 
 @Wikis = Wikis
diff --git a/app/views/projects/wikis/_nav.html.haml b/app/views/projects/wikis/_nav.html.haml
index 8932585..0a7e51e 100644
--- a/app/views/projects/wikis/_nav.html.haml
+++ b/app/views/projects/wikis/_nav.html.haml
@@ -12,7 +12,7 @@
 
   - if can?(current_user, :write_wiki, @project)
     .pull-right
-      = link_to '#', class: "add-new-wiki btn btn-new" do
+      = link_to '#modal-new-wiki', class: "add-new-wiki btn btn-new", "data-toggle" => "modal" do
         %i.icon-plus
         New Page
 
--
libgit2 0.21.2