From: Maciej Tronowski <mtro@man.poznan.pl>
Date: Mon, 23 Mar 2015 09:33:12 +0000 (+0100)
Subject: signal selecting file
X-Git-Tag: v1.0~120
X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=commitdiff_plain;h=6b7a14ba918e8b4607c5652920b8ae7dab79e42d;hp=b1f2eaf9a8779f9b8bcb6e396d535b6044667133;p=qcg-portal.git

signal selecting file
---

diff --git a/filex/static/filex/filex.js b/filex/static/filex/filex.js
index 3aed569..e1dc50f 100644
--- a/filex/static/filex/filex.js
+++ b/filex/static/filex/filex.js
@@ -148,10 +148,8 @@ $(function(){
         },
 
         selected: function(e) {
-            if (this.model.isDir()) {
-                e.preventDefault();
-                this.model.trigger('selected:dir', this.model);
-            }
+            e.preventDefault();
+            this.model.trigger(this.model.isDir() ? 'selected:dir' : 'selected:file', this.model);
         }
     });
 
@@ -212,6 +210,7 @@ $(function(){
             this.listenTo(this.path, 'selected', this.selectedPath);
             this.listenTo(this.files, 'reset', this.resetFiles);
             this.listenTo(this.files, 'selected:dir', this.selectedDir);
+            this.listenTo(this.files, 'selected:file', this.selectedFile);
 
             // used in selectize callbacks
             var view = this,
@@ -334,6 +333,10 @@ $(function(){
             this.path.add({'text': dir.get('name'), 'path': dir.get('name')});
         },
 
+        selectedFile: function(file) {
+            this.trigger('selected:file', this.host + this.path.full() + '/' + file.get('name'));
+        },
+
         selectedPath: function(bit) {
             var newPath = this.path.slice(0, this.path.indexOf(bit) + 1);
             this.path.set(newPath);
diff --git a/filex/templates/filex/source.js.html b/filex/templates/filex/source.js.html
index db1a91b..4942015 100644
--- a/filex/templates/filex/source.js.html
+++ b/filex/templates/filex/source.js.html
@@ -6,9 +6,9 @@
 <script src="{% static 'filex/filex.js' %}"></script>
 
 <script>
-    var app;
+    var filex;
     $(function() {
-        app = new Filex.FilexView({
+        filex = new Filex.FilexView({
             host: 'qcg.man.poznan.pl',
             hostOptions: [
                 {host: 'qcg.man.poznan.pl', path: '/home/plgrid/{{ request.user.username }}/reef'},
@@ -35,10 +35,11 @@
 <script type="text/template" id="file-template">
     <td class="text-center"><span class="glyphicon glyphicon-file" aria-hidden="true"></span></td>
     <td>
-        <a href="{% url 'filex:download' %}?<%= url_params %>" class="btn btn-default btn-xs pull-right link" title="Pobierz plik">
+        <a href="{% url 'filex:download' %}?<%= url_params %>"
+           class="btn btn-default btn-xs pull-right" title="Pobierz plik">
             <span class="glyphicon glyphicon-cloud-download" aria-hidden="true"></span>
         </a>
-        <%= name %>
+        <a class="link" href="#"><%= name %></a>
     </td>
     <td class="text-right"><%= size %></td>
     <td><%= date %></td>