Commit Graph

630 Commits

Author SHA1 Message Date
lduarte1991
a5d8669f68 Annotation Tool: Removed conflict between tags-annotator and flagging-annotator 2014-07-10 11:20:29 -04:00
Waheed Ahmed
68a0f4e45c Fixed IE security warning on course page.
LMS-2892
2014-06-30 13:56:08 +05:00
lduarte1991
cd9c6c5f3e Annotations Tools: Commented OSDA code and added clarification to catch changes 2014-06-21 16:25:53 -04:00
lduarte1991
95c0738361 Annotation Tools: Removed background-color from image annotations
- Also fixed edit bug when annotation is not created first
- Also fixed indentation issues
2014-06-19 13:52:44 -04:00
Sarina Canelake
30c8da1596 Fix variable names to give context for translators
fix other various i18n issues
2014-06-18 23:28:39 -04:00
stv
fd10fbf725 Fix JSInput scope leak
Declare variables locally
- The `allSections` variable was leaking into the global scope, due to a
  typo in the declaration.
- `dataProcessed` can be declared more narrowly within the callback.
2014-06-13 11:04:24 -07:00
stv
cf14dee790 Fix JSInput test fixture
Clean up fixtures automatically between tests
- Nesting test fixture markup within a DIV allows Jasmine to
  automatically restore the fixture to a clean state between each test
  run.

Fix id attribute collision typo
- This looks like a copy/pasta gone wrong; the two test INPUT elements
  were both declared with the same id, `input_1`.

Remove trailing whitespace
2014-06-13 11:04:24 -07:00
stv
bdf90bfcfb Remove superfluous JSInput test
The behavior previously tested here was to check that if a JSInput
element was marked as not processed, re-walking the DOM *should* have
reinitialized it. Unfortunately, this behavior is not supported by the
underlying JSChannel library. In fact, if JSChannel detects an existing
channel with the same origin and scope, it throws an uncaught exception,
leaving the DOM in a "broken" state.

JSInput will prevent duplicates from being added, as long as we don't
manually update the `data-processed` attribute. This behavior is already
being tested.
2014-06-13 11:04:24 -07:00
stv
60a9e99871 Fix JSInput tests
Select DOM elements with wildcard syntax

- DOM lookups were being done with non-existent literal selectors, so it
  was returning empty lists. As assertions were to be made while
  iterating over the list of elements, nothing was actually being
  verified.

- Common code has been centralized in the setup function. By declaring
  CSS selectors once, we minimize the odds of inadvertently using the
  wrong selector, as happened here.

- Had these tests actually been iterating over a non-empty list, this
  would have thrown undefined exceptions. jQuery.each calls its handler
  with an index and an item/object as the arguments. However, the object
  is a DOM-object, not a jQuery-object.  These tests break, as they had
  assumed the latter.
2014-06-13 11:04:24 -07:00
stv
e2cab19084 Ensure JSInput tests actually run
This test currently fails, meaning that the existing tests weren't
testing what they claimed.

Assertions are made for each element returned by the CSS selectors.
However, the selectors are assumed to be wildcard matches, but are
actually literal selectors. As there are no matched elements, this
causes the assertions to be (silently) checked zero times, without
failure.
2014-06-13 11:04:24 -07:00
Sarina Canelake
2aea261d48 Merge branch 'release'
Conflicts:
	common/djangoapps/course_modes/views.py
	common/djangoapps/student/tests/test_roles.py
	common/djangoapps/student/views.py
	common/lib/opaque_keys/opaque_keys/__init__.py
	common/lib/opaque_keys/opaque_keys/tests/test_opaque_keys.py
	common/lib/xmodule/xmodule/contentstore/mongo.py
	lms/djangoapps/certificates/management/commands/gen_cert_report.py
	lms/djangoapps/notes/views.py
2014-06-10 16:59:23 -04:00
lduarte1991
894428ea9a Reverting commit @3bfb633 and updating openseadragon.js for latest build 2014-06-06 15:40:03 -04:00
lduarte1991
3bfb633fd3 Annotator Tool: Fixed delete bug and factored out settings
Removed print context
2014-06-06 12:39:35 -04:00
lduarte1991
9c0d14ea2b Annotator Tools: OpaqueKeys update for Notes 2014-06-05 15:53:26 -04:00
lduarte1991
68acf66f6c Annotation Tools: PR Fixes
- Fixed camel case for variable name
- Fixed indentation in imageannotation.html
- Changed all mentions of Instructor Username to Email
- Turned annotation_mode into phrase
- Fixed indentation in imageannotation.html
- Added comments in imageannotation.html

- Changing annotation_mode in OSDA
2014-06-05 13:05:37 -04:00
lduarte1991
b22643adc2 Image Annotation Tool: Annotation Mode for AB Testing
Annotation Tools PR Fixes

- forgot to overwrite the previous line
2014-06-05 12:47:48 -04:00
lduarte1991
8429897c82 Text Annotation Tool: Added Instructor Filter and Clear Search 2014-06-05 12:47:48 -04:00
Adam
a415b507d0 Merge pull request #3942 from edx/adam/protocol
load js without specifying protocol
2014-06-03 14:09:20 -04:00
Dave St.Germain
b073cfaece Fixes BLD-1104 2014-06-03 10:30:58 -04:00
lduarte1991
b83e27fc9d Diacritic Plugin for Annotator Tool: Pull-request Fixes
Making sure extension comes after annotator css
2014-06-02 10:45:29 -04:00
lduarte1991
de5edcffbb Diacritic Plugin for Annotator TooL: Added CSS and JS files
- UI Fixes for Diacritic Mark Plugin
2014-06-02 10:45:29 -04:00
Adam Palay
cdad4a3257 load js without specifying protocol 2014-05-30 14:02:43 -04:00
lduarte1991
e4e4b32c62 Image Annotation Tool: Add linkback functionality to image thumbnails
Changes requested in PR
2014-05-23 14:59:31 -04:00
lduarte1991
0318c95537 Image Annotation Tool Fixes
- Added component to view

- Added correct images for OSD

- Fixed path to codemirror

- Tinymce fullscreen works now

- Pep8/Pylint Fixes

- Default image changed and added call to super
2014-05-23 14:58:18 -04:00
lduarte1991
008bbc224b Image Annotation Tool: Add static images for openseadragon navigation 2014-05-23 14:57:48 -04:00
lduarte1991
32e96681f6 Image Annotation Tool: create xmodule and install js files 2014-05-23 14:57:23 -04:00
lduarte1991
c24252001c Annotation Tools: Add helper functions and fixed pep8/pylint errors
Small plugin fixes
2014-05-23 14:57:16 -04:00
Dave St.Germain
285c07fc22 Addressed review feedback. 2014-05-22 10:40:31 -04:00
Dave St.Germain
232df30b3e support aria-grabbed and aria-dropeffect 2014-05-22 09:51:50 -04:00
Dave St.Germain
f4391b5eb9 fixing drag and drop 2014-05-22 09:51:50 -04:00
lduarte1991
0c1b045f3c Using Edx version of tinymce 2014-05-16 14:02:25 -04:00
lduarte1991
e911d57911 Revert "Revert pull request #3466"
This reverts commit 59e3cae4c9.
2014-05-15 15:23:28 -04:00
David Baumgold
59e3cae4c9 Revert pull request #3466 2014-05-14 13:55:26 -04:00
David Baumgold
c0a5171c75 Merge pull request #3466 from lduarte1991/lduarte-harvardx
Reconnecting Token Generator for Annotation Tool
2014-05-09 16:14:42 -04:00
lduarte1991
edeebe7bea Fixes from @singingwolfboy in PR #3466 2014-05-08 11:37:49 -04:00
cahrens
fb150bcf64 Drag and drop on container page.
STUD-1309
2014-05-02 15:09:15 -04:00
lduarte1991
5ae1ca9685 Reconnecting Token Generator for Annotation Tool 2014-04-24 16:14:05 -04:00
David Baumgold
3b49c17c06 Merge pull request #3382 from TheJJ/patch-1
fixed retry invokation for calling setState
2014-04-23 13:34:33 -04:00
Jonas Jelten
3de30aba2e fixed retry invokation for calling setState
to successfully call a function with parameters by setTimeout,
it needs to be a function that will be called by setTimeout internally.

this patch actually enables multiple tries for calling the setState function.
2014-04-18 23:00:25 +02:00
Adam Palay
6d356a4512 change .ui-disabled to .is-disabled 2014-04-17 11:15:02 -04:00
Adam Palay
7636ad3240 Add javascript backup if pointer-event is not supported by browser
(STUD-1498)
2014-04-16 14:44:50 -04:00
Dave St.Germain
0a19c96a08 updated pdf viewer 2014-04-14 14:28:06 -04:00
Chris Dodge
a904fa09bd Revert "updated pdf viewer"
This reverts commit b0a7443570.
2014-04-08 12:59:04 -04:00
Greg Price
a77968660f Merge pull request #3228 from edx/gprice/FOR-542
Change behavior of cohort addition interface
2014-04-07 12:54:38 -04:00
Greg Price
707ee5f2c7 Change behavior of cohort addition interface
Instead of noting users that are already in a cohort and not changing
such users, clobber the previous cohort and display a message indicating
the previous cohort membership.

JIRA: FOR-452
2014-04-07 11:40:51 -04:00
Dave St.Germain
ad186e236e Merge pull request #2986 from edx/dcs/a11y-pdfreader
Accessible PDF textbook viewer
2014-04-07 10:32:28 -04:00
cahrens
e4de5d2eda Match our default code editor font size of 13. 2014-04-02 11:12:34 -04:00
Brian Talbot
473ed4cc89 Studio: syncing up font-based styling between TinyMCE editing view and Studio HTML xmodule preview
Separating and documenting tinyMCE font imports from customized vendor code and customized render styling css files (because font must load first in iframe).

Add the TinyMCE font file to the CMS pipeline.
2014-04-02 11:12:34 -04:00
cahrens
b04a0d9986 Update default font size to 14 for bulk e-mail editor (LMS). 2014-04-02 11:12:34 -04:00
Brian Talbot
cc15a267ae revising default (minified) TinyMCE content CSS to be scoped to .mce-content-body element 2014-04-02 11:12:34 -04:00