ylqjgm
/
canvas-lms
mirror of https://github.com/instructure/canvas-lms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

make rake canvas:compile_assets happy in 1.9.3 

fix for tinymce files adapted from
https://github.com/spohlenz/tinymce-rails/blob/master/Rakefile#L45-52

Change-Id: I7fd70a5f10dacb749623f63f46c7fc592b13552b
Reviewed-on: https://gerrit.instructure.com/14963
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Ethan Vizitei <ethan@12spokes.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
This commit is contained in:
Jacob Fugal 2012-11-01 14:35:27 -06:00
parent 249b85acfe
commit 7b4fdc4f9d
8 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/controllers/eportfolios_controller.rb
View File

@ -23,7 +23,6 @@ class EportfoliosController < ApplicationController
def index
user_index
# @portfolios = Eportfolio.find_all_by_public(true)
end
def user_index

2
app/stylesheets/print.scss
View File

@ -1,3 +1,5 @@
// # encoding: UTF-8
@import "environment.sass";
@media print {

2
app/stylesheets/screen.sass
View File

@ -1,3 +1,5 @@
/* # encoding: UTF-8
/*
Welcome to Compass.
In this file you should write your main styles. (or centralize your imports)

4
app/views/assignments/_grade_assignment.html.erb
View File

@ -16,7 +16,7 @@
<b><br /><%= t :resubmission_count, { :one => "1 Ungraded Re-submission", :other => "%{count} Ungraded Re-submissions" }, :count => resubmitted %></b>
<% end %>
</div>
<a target="_blank" class="button button-sidebar-wide" href="<%= context_url(@context, :speed_grader_context_gradebook_url, :assignment_id => @assignment.id) %>"><%= image_tag "grading_icon.png" %> <%= t 'links.speedgrader', "SpeedGrader™" %></a><br/>
<a target="_blank" class="button button-sidebar-wide" href="<%= context_url(@context, :speed_grader_context_gradebook_url, :assignment_id => @assignment.id) %>"><%= image_tag "grading_icon.png" %> <%= t 'links.speedgrader', "SpeedGrader&trade;" %></a><br/>
<% if @assignment.submission_types && @assignment.submission_types.match(/(online_upload|online_text_entry|online_url)/)%>
<div>
<%= render :partial => 'submissions/submission_download' %>
@ -44,7 +44,7 @@ Students will see the modified files in their comments for the submission.
<% end %>
</div>
<% else %>
<a target="_blank" class="button button-sidebar-wide" href="<%= context_url(@context, :speed_grader_context_gradebook_url, :assignment_id => @assignment.id) %>"><%= image_tag "grading_icon.png" %> <%= t 'links.speedgrader', "SpeedGrader™" %></a>
<a target="_blank" class="button button-sidebar-wide" href="<%= context_url(@context, :speed_grader_context_gradebook_url, :assignment_id => @assignment.id) %>"><%= image_tag "grading_icon.png" %> <%= t 'links.speedgrader', "SpeedGrader&trade;" %></a>
<% end %>
<div class="rs-margin-lr">
<a style="<%= hidden unless @assignment.has_peer_reviews? %>" class="assignment_peer_reviews_link button button-sidebar-wide" href="<%= context_url(@context, :context_assignment_peer_reviews_url, @assignment.id) %>"><%= image_tag "word_bubble.png", :alt => "" %> <%= t 'links.peer_reviews', "Peer Reviews" %></a>

1
doc/api/topic/html/setup.rb
View File

@ -35,6 +35,7 @@ end
def topic_doc
@docstring = options[:controllers].map { |c| c.docstring }.join("\n\n")
@object = @object.dup
def @object.source_type; nil; end
@json_objects = options[:json_objects][@resource] || []
erb(:topic_doc)

28
lib/tasks/i18n.rake
View File

@ -1,9 +1,9 @@
namespace :i18n do
module HashExtensions
def flatten(result={}, prefix='')
def flatten_keys(result={}, prefix='')
each_pair do |k, v|
if v.is_a?(Hash)
v.flatten(result, "#{prefix}#{k}.")
v.flatten_keys(result, "#{prefix}#{k}.")
else
result["#{prefix}#{k}"] = v
end
@ -11,7 +11,7 @@ namespace :i18n do
result
end
def expand(result = {})
def expand_keys(result = {})
each_pair do |k, v|
parts = k.split('.')
last = parts.pop
@ -187,7 +187,7 @@ namespace :i18n do
locales = I18n.available_locales - [:en]
all_translations = I18n.backend.send(:translations)
flat_translations = all_translations.flatten
flat_translations = all_translations.flatten_keys
if locales.empty?
puts "Nothing to do, there are no non-en translations"
@ -200,7 +200,7 @@ namespace :i18n do
extractor.translations = {}
extractor.process(File.read(file), *arg_block.call(file)) or next
translations = extractor.translations.flatten.keys
translations = extractor.translations.flatten_keys.keys
next if translations.empty?
file_translations[extractor.scope] ||= {}
@ -240,7 +240,7 @@ define(['i18nObj', 'jquery'], function(I18n, $) {
end
file_translations.each do |scope, translations|
dump_translations.call(scope, translations.expand)
dump_translations.call(scope, translations.expand_keys)
end
# in addition to getting the non-en stuff into each scope_file, we need to get the core
@ -282,7 +282,7 @@ define(['i18nObj', 'jquery'], function(I18n, $) {
if $?.exitstatus == 0
if ret.include?(base_filename)
`git checkout #{arg}`
if previous = YAML.load(File.read(base_filename)).flatten rescue nil
if previous = YAML.load(File.read(base_filename)).flatten_keys rescue nil
last_export = {:type => :commit, :data => previous}
else
$stderr.puts "Unable to load en.yml file"
@ -297,7 +297,7 @@ define(['i18nObj', 'jquery'], function(I18n, $) {
else
puts "Loading previous export..."
if File.exist?(arg)
if previous = YAML.load(File.read(arg)).flatten rescue nil
if previous = YAML.load(File.read(arg)).flatten_keys rescue nil
last_export = {:type => :file, :data => previous}
else
$stderr.puts "Unable to load yml file"
@ -319,14 +319,14 @@ define(['i18nObj', 'jquery'], function(I18n, $) {
Rake::Task["i18n:generate"].invoke
puts "Exporting #{last_export[:data] ? "new/changed" : "all"} en translations..."
current_strings = YAML.load(File.read(base_filename)).flatten
current_strings = YAML.load(File.read(base_filename)).flatten_keys
new_strings = last_export[:data] ?
current_strings.inject({}){ |h, (k, v)|
h[k] = v unless last_export[:data][k] == v
h
} :
current_strings
File.open(export_filename, "w"){ |f| f.write new_strings.expand.ya2yaml(:syck_compatible => true) }
File.open(export_filename, "w"){ |f| f.write new_strings.expand_keys.ya2yaml(:syck_compatible => true) }
push = 'n'
begin
@ -387,7 +387,7 @@ define(['i18nObj', 'jquery'], function(I18n, $) {
source_translations = File.exist?(arg) && YAML.load(File.read(arg)) rescue nil
end until source_translations
raise "Source does not have any English strings" unless source_translations.keys.include?('en')
source_translations = source_translations['en'].flatten
source_translations = source_translations['en'].flatten_keys
begin
puts "Enter path to translated file:"
@ -397,7 +397,7 @@ define(['i18nObj', 'jquery'], function(I18n, $) {
raise "Translation file contains multiple languages" if new_translations.size > 1
language = new_translations.keys.first
raise "Translation file appears to have only English strings" if language == 'en'
new_translations = new_translations[language].flatten
new_translations = new_translations[language].flatten_keys
item_warning = lambda { |error_items, description|
begin
@ -442,9 +442,9 @@ define(['i18nObj', 'jquery'], function(I18n, $) {
I18n.available_locales
new_translations = (I18n.backend.send(:translations)[language.to_sym] || {}).flatten.merge(new_translations)
new_translations = (I18n.backend.send(:translations)[language.to_sym] || {}).flatten_keys.merge(new_translations)
File.open("config/locales/#{language}.yml", "w") { |f|
f.write({language => new_translations.expand}.ya2yaml(:syck_compatible => true))
f.write({language => new_translations.expand_keys}.ya2yaml(:syck_compatible => true))
}
end
end

2
public/javascripts/tinymce/jscripts/tiny_mce/plugins/spellchecker/editor_plugin.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/javascripts/tinymce/jscripts/tiny_mce/plugins/spellchecker/editor_plugin_src.js vendored
View File

@ -167,7 +167,7 @@
},
_getSeparators : function() {
var re = '', i, str = this.editor.getParam('spellchecker_word_separator_chars', '\\s!"#$%&()*+,-./:;<=>?@[\]^_{|}§©«®±¶·¸»¼½¾¿×÷¤\u201d\u201c');
var re = '', i, str = this.editor.getParam('spellchecker_word_separator_chars', '\\s!"#$%&()*+,-./:;<=>?@[\]^_{|}§©«®±¶·¸»¼½¾¿×÷¤\u201d\u201c');
// Build word separator regexp
for (i=0; i<str.length; i++)