Commit a789dcae authored by Jason Lee's avatar Jason Lee

use JavaScript instead of CoffeeScript in Views, the reason #9819

parent 70cba8e9
...@@ -52,5 +52,5 @@ ...@@ -52,5 +52,5 @@
= render 'projects/buttons/notifications' = render 'projects/buttons/notifications'
:coffeescript :javascript
new Star() new Star();
\ No newline at end of file
...@@ -18,10 +18,10 @@ ...@@ -18,10 +18,10 @@
%tbody %tbody
= spinner nil, true = spinner nil, true
:coffeescript :javascript
projectFindFile = new ProjectFindFile($(".file-finder-holder"), { var projectFindFile = new ProjectFindFile($(".file-finder-holder"), {
url: "#{escape_javascript(namespace_project_files_path(@project.namespace, @project, @ref, @options.merge(format: :json)))}" url: "#{escape_javascript(namespace_project_files_path(@project.namespace, @project, @ref, @options.merge(format: :json)))}",
treeUrl: "#{escape_javascript(namespace_project_tree_path(@project.namespace, @project, @ref))}" treeUrl: "#{escape_javascript(namespace_project_tree_path(@project.namespace, @project, @ref))}",
blobUrlTemplate: "#{escape_javascript(namespace_project_blob_path(@project.namespace, @project, @id || @commit.id))}" blobUrlTemplate: "#{escape_javascript(namespace_project_blob_path(@project.namespace, @project, @id || @commit.id))}"
}) });
new ShortcutsFindFile(projectFindFile) new ShortcutsFindFile(projectFindFile);
...@@ -20,27 +20,29 @@ ...@@ -20,27 +20,29 @@
= emoji_icon(emoji["name"], emoji["unicode"], emoji["aliases"]) = emoji_icon(emoji["name"], emoji["unicode"], emoji["aliases"])
- if current_user - if current_user
:coffeescript :javascript
post_emoji_url = "#{award_toggle_namespace_project_notes_path(@project.namespace, @project)}" var post_emoji_url = "#{award_toggle_namespace_project_notes_path(@project.namespace, @project)}";
noteable_type = "#{votable.class.name.underscore}" var noteable_type = "#{votable.class.name.underscore}";
noteable_id = "#{votable.id}" var noteable_id = "#{votable.id}";
aliases = #{AwardEmoji.aliases.to_json} var aliases = #{AwardEmoji.aliases.to_json};
window.awards_handler = new AwardsHandler( window.awards_handler = new AwardsHandler(
post_emoji_url, post_emoji_url,
noteable_type, noteable_type,
noteable_id, noteable_id,
aliases aliases
) );
$(".awards").on "click", ".emoji-menu-content li", (e) -> $(".awards").on("click", ".emoji-menu-content li", function(e) {
emoji = $(this).find(".emoji-icon").data("emoji") var emoji = $(this).find(".emoji-icon").data("emoji");
awards_handler.addAward(emoji) awards_handler.addAward(emoji);
});
$(".awards").on "click", ".award", (e) -> $(".awards").on("click", ".award", function(e) {
emoji = $(this).find(".icon").data("emoji") var emoji = $(this).find(".icon").data("emoji");
awards_handler.addAward(emoji) awards_handler.addAward(emoji);
});
$(".award").tooltip() $(".award").tooltip();
$(".emoji-menu-content").niceScroll({cursorwidth: "7px", autohidemode: false}) $(".emoji-menu-content").niceScroll({cursorwidth: "7px", autohidemode: false});
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment