Skip to content

Commit 07b7332

Browse files
committed
Rereference client_app symlinks to be more specific
This helps with grep and some IDEs which can't handle infinite directory structures. Test Plan: - Confirm that the quiz statistics and quiz event logs still work as awesome as ever, nay awesomer. Change-Id: Ibbcdafac17ffff3c06c82666b5edbc695760abca Reviewed-on: https://gerrit.instructure.com/54385 Tested-by: Jenkins Reviewed-by: Brian Finney <bfinney@instructure.com> QA-Review: Michael Hargiss <mhargiss@instructure.com> Product-Review: Ryan Taylor <rtaylor@instructure.com>
1 parent 8e2dd74 commit 07b7332

11 files changed

Lines changed: 15 additions & 49 deletions

File tree

client_apps/canvas_quizzes/.sublime-project

Lines changed: 0 additions & 37 deletions
This file was deleted.

client_apps/canvas_quizzes/config/requirejs/development.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ requirejs.config({
3131

3232
// ========================================================================
3333
// Internal, for package providers only:
34-
'canvas': '../../../vendor/canvas/public/javascripts',
34+
'canvas': '../../../vendor/canvas_public/javascripts',
35+
'canvas_app': '../../../vendor/canvas_app'
3536
},
3637

3738
shim: {

client_apps/canvas_quizzes/config/requirejs/test.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ requirejs.config({
2222

2323
'test': '../test',
2424
'fixtures': '../test/fixtures',
25-
'canvas_quizzes': '../../common/js'
25+
'canvas_quizzes': '../../common/js',
26+
'canvas_app': '../../vendor/canvas_app'
2627
},
2728

2829
deps: [

client_apps/canvas_quizzes/doc/main.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
@import "/vendor/canvas/public/stylesheets_compiled/new_styles_normal_contrast/pages/g_vendor.css";
2-
@import "/vendor/canvas/public/stylesheets_compiled/new_styles_normal_contrast/base/c-common.css";
1+
@import "/vendor/canvas_public/stylesheets_compiled/new_styles_normal_contrast/pages/g_vendor.css";
2+
@import "/vendor/canvas_public/stylesheets_compiled/new_styles_normal_contrast/base/c-common.css";
33
@import "/dist/canvas_quizzes.css";
44

55
.seed-data { display: none; }

client_apps/canvas_quizzes/tasks/options/grunt-jasmine.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ var SHARED_CONFIG = {
3030
version: '2.0.0',
3131

3232
styles: [
33-
"vendor/canvas/public/stylesheets_compiled/new_styles_normal_contrast/pages/g_vendor.css",
34-
"vendor/canvas/public/stylesheets_compiled/new_styles_normal_contrast/base/c-common.css",
33+
"vendor/canvas_public/stylesheets_compiled/new_styles_normal_contrast/pages/g_vendor.css",
34+
"vendor/canvas_public/stylesheets_compiled/new_styles_normal_contrast/base/c-common.css",
3535
"dist/<%= grunt.config.get('pkg.name') %>.css"
3636
]
3737
};

client_apps/canvas_quizzes/tasks/options/grunt-sass.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ module.exports = {
33
options: {
44
style: 'expanded',
55
includePaths: [
6-
'vendor/canvas/app/stylesheets',
7-
'vendor/canvas/app/stylesheets/variants/new_styles_normal_contrast'
6+
'vendor/canvas_app/stylesheets',
7+
'vendor/canvas_app/stylesheets/variants/new_styles_normal_contrast'
88
],
99
outputStyle: 'nested'
1010
},

client_apps/canvas_quizzes/vendor/canvas

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../app/
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../public/

client_apps/canvas_quizzes/vendor/packages/jquery/instructure_date_and_time.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,4 +68,4 @@ requirejs.config({
6868
});
6969

7070
define([ 'canvas/jquery.instructure_date_and_time' ], function() {
71-
});
71+
});

0 commit comments

Comments
 (0)