Commit Graph

124 Commits

Author SHA1 Message Date
Nimisha Asthagiri
f44a1b6c1c Tiny MCE version 4.0.20
Changed tiny-MCE to not load CSS files dynamically.
Added CSS files for tiny-MCE in env files.
Moved TinyMCE files to directory structure required by Jake command.
Changed clients of "tinymce.min.js" to use "tinymce.full.min.js" instead.
Updated CHANGELOG to indicate tinymce version 4.0.20.
Renamed tinymce.css.
Directions for creating tinymce.full.min.js and commenting of edX changes.
Updated comments related to disabling dynamic JS and CSS file loading in tinymce.
Allow TinyMCE to handle CSS within the iframe.
2014-04-02 11:12:26 -04:00
Abdallah
fe847720ea Upgrade to TinyMCE 4.0.16.
Detailed commit messages:
deleted old tinymce

new tinymce
js changes to support new tinymce
scss changes for alignments

Include all the controls on the toolbar that we previously had.

Changes to support Bulk e-mail usage.

adding new studio skin for TinyMCE4

Get handling of static image links working again.

Delete old Studio skin.

Version 1.3 of CodeMirror plugin.

Modify paths for location of CodeMirror files.

Fire events when CodeMirror Editor is open and closed.

Needed to switch static links back and forth.

Remove CodeMirror tabbed editor.

fixed tinymce visual editor css

Change how we detect that an image has been inserted.

made the codemirror look more studio-like

reordered the tinymce buttons

Update unit tests.

Update acceptance test for image plugin.

Make sure to strip out temporary caret.

It can get left behind in style blocks.

Test for style block being maintained.

Allow TinyMCE to create p's, else formatting doesn't work.

Add tests for toolbar buttons and converting links.

Add test for code format toolbar button.

Remove unnecessary code.

Remove unused testing templates and unused tabs.

Update tinymce paths.

Fire an event with the link plugin closes so we can rewrite links.

pep8

Updates from code review.

Change the name of the button to "Edit HTML".

Changed menu name for consistency, but we don't show it.

Changed name of "code" toolbar button to "Code block".

Switch from tabbed Visual/HTML Editor for HTML modules to showing the code editor as a plugin within TinyMCE (triggered from toolbar). STUD-1422

Fire events before and after the image dialog is shown.

We use this to rewrite links.

Change the event handling for image plugin.

Fixes FireFox bug, and allows us to correct the image path when we show the plugin (as opposed ot only correcting path when we close the plugin).

Code review feedback.

Fire events before and after the link dialog is shown.

This allows us to convert the static links.

Remove unnecessary helper method.

keeping the component editor inside the component window

Use compressed CodeMirror file.

replaced code icon in TinyMCE editor; simplified UI on TMCE toolbar

Change code editor icon to say HTML.

Move code style block button.

Update tests for minor UI changes.

Code editor button no longer shows an icon, and code style toolbar button location has moved.

Fix typos.
2014-04-02 10:35:27 -04:00
Valera Rozuvan
e50fad6475 Fix failing tender. 2014-03-27 20:36:08 +02:00
cahrens
2c79c1fe2f Revert to older version of TinyMCE.
We had trouble with Cloudfront/hashed files and need more time
to investigate.
This reverts commit e8f53ac9dc6d8a1d9928787635c7c5f7e409a9ec.
2014-03-26 11:06:59 -04:00
Abdallah
dda5866180 new tinymce
js changes to support new tinymce
scss changes for alignments
2014-03-21 14:41:56 -04:00
Dave St.Germain
6d50ff7b61 Set the html language to the browser's specified language 2014-01-28 16:43:29 -05:00
Andy Armstrong
fa55ac1315 Fix URI vendor module to be referenced via a relative URL. 2014-01-06 11:31:58 -05:00
Andy Armstrong
f9c45586a4 Add pagination to Studio's Files and Uploads page
These changes implement STUD-813. The commit consists of the
following logical changes:
 - a REST API has been implemented for a course's assets
 - the page itself now fetches the assets client-side
 - the Backbone.Paginator library is used to support pagination
 - the AssetCollection has been refactored to extend
   Backbone.Paginator.requestPager so that it can be paged
 - an abstract PagingView class has been added to generalize
   the communication with a paging REST API
 - the AssetsView has been reimplemented to extend PagingView
 - two new child views have been added:
   - PagingHeader: the paging controls above the list of assets
   - PagingFooter: the paging controls below the assets
2014-01-05 23:35:12 -05:00
polesye
70518a4659 BLD-506: Update behavior of start/end time fields. 2013-12-18 09:43:11 +02:00
David Baumgold
b32f2bc170 MITX_ROOT_URL => EDX_ROOT_URL 2013-12-04 12:59:35 -05:00
Brian Talbot
722ddb62d3 Studio: resolves IE notifications display issue and abstracts CSS to avoid IE selector/rule limit
STUD-815
2013-11-12 13:00:22 -05:00
David Baumgold
e1c94888e4 If the YouTube API JS fails to load, the rest of the JS should still run
Fixes BLD-472
2013-11-05 10:22:01 -05:00
Brian Talbot
b7594142fc Studio: adds in specific older IE support area into Sass/CSS architecture 2013-10-26 21:26:53 -04:00
Brian Talbot
95dd21738c Studio: revises CSS reference/pipeline architecture for better organization, reduced redundancy, and to handle IE9 selector limits 2013-10-26 21:26:53 -04:00
thedeadparrot
19129e6081 Add masked input back into RequireJS 2013-10-24 19:50:56 -04:00
Brian Talbot
de12777555 simplifying semantic and stylistic properties of skip nav UI 2013-10-24 17:12:40 -04:00
Diana Huang
43bdb5da54 Minor fixes to match new HTML and CSS updates.
LMS-1311
2013-10-24 17:12:20 -04:00
Brian Talbot
5b63b176da revises semantics and Sass used for skip navigation 2013-10-24 17:12:19 -04:00
Diana Huang
d34c4a66c7 Add skip links to both CMS and LMS
* add HTML for links
* hide links when they are not focused
* when focused, show link (as recommended)
* move accessibility tools to common

LMS-1311
2013-10-24 17:10:33 -04:00
polesye
9dd6c56f9f Add isoTime js view. 2013-10-23 13:00:36 +03:00
Anton Stupak
aecc20af6b Add Timed Transcripts Editor. 2013-10-22 21:45:03 +03:00
David Baumgold
68f6aa8c98 Merge pull request #1404 from edx/db/requirejs-configure-mathjax
Configure MathJax using require.js
2013-10-21 07:33:08 -07:00
Calen Pennington
12cc4a19c0 Merge pull request #1224 from cpennington/lms-xblock-js-execution
Add an XBlock javascript runtime, and use it to run XModules
2013-10-21 05:53:36 -07:00
Calen Pennington
ce6fbae693 Add an XBlock javascript runtime, and use it to run XModules
[LMS-57]
2013-10-18 16:31:32 -04:00
David Baumgold
97941530e3 Configure MathJax using require.js 2013-10-18 13:31:51 -04:00
David Baumgold
76e6f8bc0d Fix up Tender load order
So that tender_widget.js loads after we've defined window.Tender
2013-10-16 17:25:58 -04:00
David Baumgold
40e540284f wait to load video module until YT API is ready 2013-10-16 13:28:28 +03:00
David Baumgold
eec7118f2b enable tender
This reverts commit 96485694d3.
2013-10-15 14:19:26 -04:00
cahrens
6a7b88df4d Move sock JS code into its own file. 2013-10-15 12:59:22 -04:00
David Baumgold
96485694d3 disable tender
because their Javascript breaks our page
2013-10-15 10:25:48 -04:00
David Baumgold
1007f5aeb4 load gettext on every page 2013-10-11 17:11:59 -04:00
David Baumgold
3e9c09e097 Ensure that jQuery loads before any other JS dependency 2013-10-10 14:27:29 -04:00
David Baumgold
7a24188ca6 Merge pull request #1278 from edx/db/increase-requirejs-timeout
Increase requirejs load timeout to 60 seconds
2013-10-10 09:37:39 -07:00
David Baumgold
7f783da16c Increase requirejs load timeout to 60 seconds 2013-10-09 11:53:37 -04:00
David Baumgold
61c25fa6ee load common libs via require
using requirejs config to define deps
2013-10-09 11:38:14 -04:00
David Baumgold
f1a104754e load jquery in requirejs deps 2013-10-08 11:40:42 -04:00
cahrens
61cfb91218 Cleanup to drag and drop implementation.
Also includes RequireJS changes.

Fixes bugs:
STUD-755, STUD-152, STUD-700, STUD-699
2013-10-07 17:18:40 -04:00
David Baumgold
d97921e6e2 Convert Studio JS to use require.js 2013-10-04 13:43:50 -04:00
David Baumgold
1eae675952 Create a dedicated CMS.Models.Course Backbone model
Initialize on every page that has a context_course set
2013-08-01 13:39:47 -04:00
David Baumgold
a6f349dab9 Studio i18n 2013-07-12 16:25:39 -04:00
David Baumgold
c45dbca771 Fix JS dependency issues
textbook.js is apparently being loaded on every page, so I just made sure that
Backbone Associations was also loaded on every page to be sure that the dependency
was always being met.
2013-07-09 19:16:06 -04:00
Peter Fogg
72e08456a8 Refactor Advanced Settings page to use Backbone notifications. 2013-06-24 09:48:37 -04:00
David Baumgold
aa24508024 Add underscore.string library
http://epeli.github.io/underscore.string/
2013-06-18 10:23:18 -04:00
David Baumgold
b6e3b0ee03 Refactor Backbone Notifications
Models are extraneous for something as temporary as a notifaction -- this change
moves all the configuration into the views, and removes the models entirely.
2013-06-18 10:20:31 -04:00
David Baumgold
4f1e6c484e Put the advanced settings notifications back in 2013-05-30 15:08:40 -04:00
Frances Botsford
dfb623a29f removed old icon css and js files and references that are no longer needed 2013-05-24 09:01:15 -04:00
David Baumgold
dc2acb18ee Moved global AJAX Error handler definition to main.coffee 2013-05-22 15:55:55 -04:00
David Baumgold
9e864834bd Unify system feedback templates
Also, a SystemFeedback model no longer has a `type`, it has an `intent`. This is
because SystemFeedback views have `type`, as well, and this prevents a naming
collision.
2013-05-22 15:55:55 -04:00
David Baumgold
55cd8afe34 Fixing copy for default server error message on notification 2013-05-22 15:55:54 -04:00
Brian Talbot
52b10df805 studio - revises copy of server error notification to include a default message and removes associated actions from notifications 2013-05-22 15:55:53 -04:00