Merge branch 'master' of github.com:gitlabhq/gitlabhq

6 files changed, 160 insertions, 1 deletions

diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee
index b9b095e004a..c095e5ae2b1 100644
--- a/app/assets/javascripts/application.js.coffee
+++ b/app/assets/javascripts/application.js.coffee
@@ -40,6 +40,7 @@
 #= require shortcuts_network
 #= require jquery.nicescroll.min
 #= require_tree .
+#= require fuzzaldrin-plus.min
 
 window.slugify = (text) ->
   text.replace(/[^-a-zA-Z0-9]+/g, '_').toLowerCase()
diff --git a/app/assets/javascripts/dispatcher.js.coffee b/app/assets/javascripts/dispatcher.js.coffee
index 69e061ce6e9..58d6b9d4060 100644
--- a/app/assets/javascripts/dispatcher.js.coffee
+++ b/app/assets/javascripts/dispatcher.js.coffee
@@ -87,7 +87,9 @@ class Dispatcher
         new GroupAvatar()
       when 'projects:tree:show'
         new TreeView()
-        shortcut_handler = new ShortcutsNavigation()
+        shortcut_handler = new ShortcutsTree()
+      when 'projects:find_file:show'
+        shortcut_handler = true
       when 'projects:blob:show'
         new LineHighlighter()
         shortcut_handler = new ShortcutsNavigation()
diff --git a/app/assets/javascripts/project_find_file.js.coffee b/app/assets/javascripts/project_find_file.js.coffee
new file mode 100644
index 00000000000..0dd32352c34
--- /dev/null
+++ b/app/assets/javascripts/project_find_file.js.coffee
@@ -0,0 +1,125 @@
+class @ProjectFindFile

+  constructor: (@element, @options)->

+    @filePaths = {}

+    @inputElement = @element.find(".file-finder-input")

+

+    # init event

+    @initEvent()

+

+    # focus text input box

+    @inputElement.focus()

+

+    # load file list

+    @load(@options.url)

+

+  # init event

+  initEvent: ->

+    @inputElement.off "keyup"

+    @inputElement.on "keyup", (event) =>

+      target = $(event.target)

+      value = target.val()

+      oldValue = target.data("oldValue") ? ""

+

+      if value != oldValue

+        target.data("oldValue", value)

+        @findFile()

+        @element.find("tr.tree-item").eq(0).addClass("selected").focus()

+

+    @element.find(".tree-content-holder .tree-table").on "click", (event) ->

+      if (event.target.nodeName != "A")

+        path = @element.find(".tree-item-file-name a", this).attr("href")

+        location.href = path if path

+

+  # find file

+  findFile: ->

+    searchText = @inputElement.val()

+    result = if searchText.length > 0 then fuzzaldrinPlus.filter(@filePaths, searchText) else @filePaths

+    @renderList result, searchText

+

+  # files pathes load

+  load: (url) ->

+    $.ajax

+      url: url

+      method: "get"

+      dataType: "json"

+      success: (data) =>

+        @element.find(".loading").hide()

+        @filePaths = data

+        @findFile()

+        @element.find(".files-slider tr.tree-item").eq(0).addClass("selected").focus()

+

+  # render result

+  renderList: (filePaths, searchText) ->

+    @element.find(".tree-table > tbody").empty()

+

+    for filePath, i in filePaths

+      break if i == 20

+

+      if searchText

+        matches = fuzzaldrinPlus.match(filePath, searchText)

+

+      blobItemUrl = "#{@options.blobUrlTemplate}/#{filePath}"

+

+      html = @makeHtml filePath, matches, blobItemUrl

+      @element.find(".tree-table > tbody").append(html)

+

+  # highlight text(awefwbwgtc -> <b>a</b>wefw<b>b</b>wgt<b>c</b> )

+  highlighter = (element, text, matches) ->

+    lastIndex = 0

+    highlightText = ""

+    matchedChars = []

+

+    for matchIndex in matches

+      unmatched = text.substring(lastIndex, matchIndex)

+

+      if unmatched

+        element.append(matchedChars.join("").bold()) if matchedChars.length

+        matchedChars = []

+        element.append(document.createTextNode(unmatched))

+

+      matchedChars.push(text[matchIndex])

+      lastIndex = matchIndex + 1

+

+    element.append(matchedChars.join("").bold()) if matchedChars.length

+    element.append(document.createTextNode(text.substring(lastIndex)))

+

+  # make tbody row html

+  makeHtml: (filePath, matches, blobItemUrl) ->

+    $tr = $("<tr class='tree-item'><td class='tree-item-file-name'><i class='fa fa-file-text-o fa-fw'></i><span class='str-truncated'><a></a></span></td></tr>")

+    if matches

+      $tr.find("a").replaceWith(highlighter($tr.find("a"), filePath, matches).attr("href", blobItemUrl))

+    else

+      $tr.find("a").attr("href", blobItemUrl).text(filePath)

+

+    return $tr

+

+  selectRow: (type) ->

+    rows = @element.find(".files-slider tr.tree-item")

+    selectedRow = @element.find(".files-slider tr.tree-item.selected")

+

+    if rows && rows.length > 0

+      if selectedRow && selectedRow.length > 0

+        if type == "UP"

+          next = selectedRow.prev()

+        else if type == "DOWN"

+          next = selectedRow.next()

+

+        if next.length > 0

+          selectedRow.removeClass "selected"

+          selectedRow = next

+      else

+        selectedRow = rows.eq(0)

+      selectedRow.addClass("selected").focus()

+

+  selectRowUp: =>

+    @selectRow "UP"

+

+  selectRowDown: =>

+    @selectRow "DOWN"

+

+  goToTree: =>

+    location.href = @options.treeUrl

+

+  goToBlob: =>

+    path = @element.find(".tree-item.selected .tree-item-file-name a").attr("href")

+    location.href = path if path

diff --git a/app/assets/javascripts/shortcuts_find_file.js.coffee b/app/assets/javascripts/shortcuts_find_file.js.coffee
new file mode 100644
index 00000000000..311e80bae19
--- /dev/null
+++ b/app/assets/javascripts/shortcuts_find_file.js.coffee
@@ -0,0 +1,19 @@
+#= require shortcuts_navigation
+
+class @ShortcutsFindFile extends ShortcutsNavigation
+  constructor: (@projectFindFile) ->
+    super()
+    _oldStopCallback = Mousetrap.stopCallback
+    # override to fire shortcuts action when focus in textbox
+    Mousetrap.stopCallback = (event, element, combo) =>
+      if element == @projectFindFile.inputElement[0] and (combo == 'up' or combo == 'down' or combo == 'esc' or combo == 'enter')
+        # when press up/down key in textbox, cusor prevent to move to home/end
+        event.preventDefault()
+        return false
+
+      return _oldStopCallback(event, element, combo)
+
+    Mousetrap.bind('up', @projectFindFile.selectRowUp)
+    Mousetrap.bind('down', @projectFindFile.selectRowDown)
+    Mousetrap.bind('esc', @projectFindFile.goToTree)
+    Mousetrap.bind('enter', @projectFindFile.goToBlob)
diff --git a/app/assets/javascripts/shortcuts_tree.coffee b/app/assets/javascripts/shortcuts_tree.coffee
new file mode 100644
index 00000000000..ba0839c9fc0
--- /dev/null
+++ b/app/assets/javascripts/shortcuts_tree.coffee
@@ -0,0 +1,4 @@
+class @ShortcutsTree extends ShortcutsNavigation
+  constructor: ->
+    super()
+    Mousetrap.bind('t', -> ShortcutsTree.findAndFollowLink('.shortcuts-find-file'))
diff --git a/app/assets/stylesheets/pages/tree.scss b/app/assets/stylesheets/pages/tree.scss
index d4ab6967ccd..97505edeabf 100644
--- a/app/assets/stylesheets/pages/tree.scss
+++ b/app/assets/stylesheets/pages/tree.scss
@@ -1,5 +1,13 @@
 .tree-holder {
 
+  .file-finder {
+    width: 50%;
+    .file-finder-input {
+      width: 95%;
+      display: inline-block;
+    }
+  }
+
   .tree-table {
     margin-bottom: 0;