From 0cece1d07fb6696d680301f68d8810052d97ba49 Mon Sep 17 00:00:00 2001 From: Hauke Klement Date: Tue, 3 Mar 2015 16:16:39 +0100 Subject: [PATCH] fix for broken navigation to binary workspace files --- app/assets/javascripts/editor.js | 2 +- app/views/exercises/_editor_frame.html.slim | 19 ++++++++++--------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/app/assets/javascripts/editor.js b/app/assets/javascripts/editor.js index 7aaae81f..0a45a7cf 100644 --- a/app/assets/javascripts/editor.js +++ b/app/assets/javascripts/editor.js @@ -252,7 +252,7 @@ $(function() { filename: $(this).text(), id: parseInt($(this).attr('id')) }; - var frame = $('.editor[data-file-id="' + active_file.id + '"]').parent(); + var frame = $('[data-file-id="' + active_file.id + '"]').parent(); showFrame(frame); toggleButtonStates(); }); diff --git a/app/views/exercises/_editor_frame.html.slim b/app/views/exercises/_editor_frame.html.slim index 89dadcad..9f72aa91 100644 --- a/app/views/exercises/_editor_frame.html.slim +++ b/app/views/exercises/_editor_frame.html.slim @@ -1,13 +1,14 @@ .frame data-executable=file.file_type.executable? data-filename=file.name_with_extension data-renderable=file.file_type.renderable? data-role=file.role - if file.file_type.binary? - - if file.file_type.renderable? - - if file.file_type.audio? - = audio_tag(file.native_file.url, controls: true) - - elsif file.file_type.image? - = image_tag(file.native_file.url) - - elsif file.file_type.video? - = video_tag(file.native_file.url, controls: true) - - else - = link_to(file.native_file.file.name_with_extension, file.native_file.url) + .binary-file data-file-id=file.ancestor_id + - if file.file_type.renderable? + - if file.file_type.audio? + = audio_tag(file.native_file.url, controls: true) + - elsif file.file_type.image? + = image_tag(file.native_file.url) + - elsif file.file_type.video? + = video_tag(file.native_file.url, controls: true) + - else + = link_to(file.native_file.file.name_with_extension, file.native_file.url) - else .editor data-file-id=file.ancestor_id data-indent-size=file.file_type.indent_size data-mode=file.file_type.editor_mode data-read-only=file.read_only = file.content