mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-26 18:42:40 +01:00
Code Issues Projects Releases Wiki Activity
69,458 Commits 36 Branches 527 Tags
Commit Graph

354 Commits

Author SHA1 Message Date
Marina Glancy
49b9144c87 Merge branch 'm28_MDL-46315' of git://github.com/totara/moodle 2014-08-12 15:01:30 +08:00
Andrew Nicols
74ce46e4ae MDL-45759 javascript: Handle setting of the confirm button fields post-init 2014-08-08 08:25:43 +08:00
Brian Barnes
ecf02bf5b5 MDL-46315 themes: Fixed display inconsistancy with help modals 2014-08-05 13:11:26 +12:00
Dan Poltawski
c44012e09e Revert "Merge branch 'm28_MDL-46431' of https://github.com/totara/moodle" 
This reverts commit 14a3ccc96da2c23fd5c34167d02e1323fb01d113, reversing
changes made to 4709708d4889e12f0f4a621ceaacb80c4cde6c51.
 2014-07-30 09:00:58 +01:00
Dan Poltawski
14a3ccc96d Merge branch 'm28_MDL-46431' of https://github.com/totara/moodle 2014-07-28 12:01:24 +01:00
Brian Barnes
a15691beeb MDL-46431 javascript_notifications: changed dialogue headings to h3's 2014-07-21 13:59:34 +12:00
Sam Chaffee
0f5e439e4b MDL-46370 Ajax and Javascript - Fixes docked blocks not expanding when using dock on right 2014-07-16 12:06:35 -06:00
Frederic Massart
cd6e149c86 MDL-45471 javascript: Escape content of exception dialogs 2014-07-08 12:59:59 +01:00
Andrew Nicols
0d1d542332 MDL-45635 javascript: Make core dialogue translatable 2014-05-23 16:01:48 +08:00
Andrew Nicols
83e8f495f2 MDL-45472 AJAX: Whitelist prototype values form JS Error in exception dialogue 2014-05-08 16:44:11 +08:00
Damyon Wiese
6d8617bed9 Merge branch 'MDL-45359-master' of git://github.com/andrewnicols/moodle 
Conflicts:
	lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-min.js
 2014-05-05 17:24:08 +08:00
Damyon Wiese
c1660772b1 MDL-44972 Atto dialogues: Change M.core.dialogue attribute name to "focusOnShowSelector" 
And some minor cleanups.
 2014-05-05 16:27:36 +08:00
Damyon Wiese
e5ddec38cd MDL-44972 Atto: Focus on the first input field in forms in dialogues. 2014-05-05 15:21:11 +08:00
Andrew Nicols
0ef60744c3 MDL-45359 JS: Only change mask zIndex on modal dialogues 
When dealing with a non-modal dialogue within a modal dialogue, we should
not update the z-index of the underyling maskNode as it does not belong to
this dialogue.
 2014-05-01 12:33:44 +08:00
Andrew Nicols
b76ed36f85 MDL-44815 core: Add chooser type to boundingbox class 2014-05-01 11:54:25 +08:00
Andrew Nicols
f857b668f9 MDL-44855 AJAX: Arrays and Objects should be defined in the initializer 
JavaScript is a prototypal language and complex types should be defined as
null in the prototype, and set up in the initializer instead.
 2014-04-22 17:03:21 +08:00
Sam Hemelryk
23a9a5632c Merge branch 'wip-MDL-45045_master' of git://github.com/gjb2048/moodle 
Conflicts:
	lib/yui/build/moodle-core-blocks/moodle-core-blocks-min.js
 2014-04-22 10:46:51 +12:00
Sam Hemelryk
65ffd68179 Merge branch 'MDL-43145-master' of git://github.com/andrewnicols/moodle 2014-04-22 10:39:09 +12:00
Andrew Nicols
5344148b34 MDL-45119 ajax: Correct use of COUNT in exception dialogue 2014-04-17 11:43:51 +08:00
Andrew Nicols
58f70bb6af MDL-43145 dock: Enable regions before the drag operation starts 2014-04-11 10:57:57 +08:00
Sam Hemelryk
34df4e4ba4 MDL-43145 dock: fixed up region_completely_docked code to ignore empty regions 2014-04-11 10:34:31 +08:00
Gareth J Barnard
625fc64c73 MDL-45045 block theme: Fake blocks show empty region when editing and clicked. 2014-04-10 18:41:50 +01:00
Dan Poltawski
4834cfdf59 Merge branch 'MDL-43856-master' of git://github.com/damyon/moodle 2014-04-07 16:58:46 +08:00
Sam Hemelryk
04f1a90d05 MDL-41551 theme_base: improved custom block region handling for base 2014-04-06 15:17:48 +12:00
Sam Hemelryk
225c418fd2 MDL-41511 blocks: improved how custom block regions were being rendered. 
There is a new theme property 'blockrendermethod' that can be set by the
theme in its config.php and tells Moodle what method it is using to render
blocks in the layout files.
Either blocks, or blocks_for_region.
Then when adding custom block regions to a page content we ensure we use
the same method the theme is using elsewhere.

This is really a hack becuase we (I) didn't properly deprecate
blocks_for_region when I added the blocks method.
 2014-04-06 15:17:47 +12:00
Damyon Wiese
441f94b263 MDL-43856 MathJax: Coding style cleanups. 2014-04-03 14:36:42 +08:00
Damyon Wiese
cc90cedc85 MDL-43856 MathJax: Improvements to the MathJax filter 
* Remove all traces of mathjax from the atto equation editor - it is filter agnostic
* Add a M.core.event module for core events that can be published/subscribed to by plugins (loose coupling)
* Add a FILTER_CONTENT_UPDATED event so plugins can tell the filter system when nodes are added to the page
* Implement a listener for this event in the MathJax filter
* Fire this event from the equation editor and from the glossary filter
* Add a nolink tag to the mathjax filter, so equations will not be processed by the other filters
* Add a smarter throttle function to the equation editor preview updates (Y.throttle is dumb)
 2014-04-03 14:36:36 +08:00
Eloy Lafuente (stronk7)
929e32489f Merge branch 'MDL-28261-master' of git://github.com/andrewnicols/moodle 2014-04-02 01:12:52 +02:00
Sam Hemelryk
0ea11b7cee Merge branch 'MDL-32729-master' of git://github.com/andrewnicols/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-04-02 09:27:23 +13:00
Andrew Nicols
6246779510 MDL-44164 atto: Refactor the world 2014-03-26 10:01:48 +08:00
Andrew Nicols
1f777e5c6c MDL-41987 Javascript: Tidy up YUI documentation 2014-03-25 17:01:37 +08:00
Andrew Nicols
6d402310a4 MDL-34353 Javascript: Allow chooser dialogues to fall back to non-JS version 
In order for a chooser dialogue to be able to fall back to it's non-JS
equivalent, we need to use a different set of styles.

This change makes the chooser dialogue preparation function add a new class
to the body which is utilised in the CSS to accomplish this. When the class
is not present, the dialogue content is displayed inline.
 2014-03-25 00:51:09 +08:00
Andrew Nicols
6bf267776c MDL-28261 Javascript: Check for a working connection in SCORM activities 2014-03-24 23:48:32 +08:00
Frederic Massart
c13854785f MDL-44334 lockscroll: Fix wrong warning message 2014-03-13 18:33:26 +01:00
Dan Poltawski
72e2a1d7eb Merge branch 'MDL-44480-master' of git://github.com/andrewnicols/moodle 
Conflicts:
	lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-min.js
 2014-03-11 14:35:51 +08:00
Andrew Nicols
b959e5085a MDL-44334 Javascript: Prevent scroll locking for small screen heights 2014-03-07 15:04:56 +08:00
Andrew Nicols
d10e611876 MDL-44480 Javascript: Correct dialogue ID generation 2014-03-06 17:02:22 +08:00
Damyon Wiese
45fdcb7ce3 MDL-43723 Blocks drag and drop: Javascript cleanup 
Declare the selector instead of repeating it several times.
 2014-02-25 17:01:45 +08:00
Damyon Wiese
58ff6e51df Merge branch 'MDL-43723-master-nomerge2' of git://github.com/mouneyrac/moodle 2014-02-25 16:43:56 +08:00
Andrew Nicols
29ee3cf789 MDL-44101 Javascript: Apply widget-focusonclose to some core dialogues 
Conflicts:
	lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-min.js
 2014-02-24 16:31:55 +08:00
Andrew Nicols
7ae6ce009e MDL-44101 Javascript: Introduce a module to focus after widget close 
This module supports focusing on a specified Node, or attempting to
determine the Node which caused the displayed the Widget to return focus to
that location.
 2014-02-24 16:31:09 +08:00
Sam Hemelryk
c10affa57b Merge branch 'MDL-43997-master' of git://github.com/andrewnicols/moodle 
Conflicts:
	lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-min.js
 2014-02-18 09:31:32 +13:00
Andrew Nicols
cfa770b47b MDL-43997 Javascript: Make all informative dialogues display correctly 
Most of the moodle core dialogue types should be shown modally, and
centred. They should also be shown on instantiation.

Rather than re-define all of these settings, this patch introduces a new
subclass of M.core.dialogue which sets them up with the same settings.
 2014-02-17 10:49:45 +08:00
Jerome Mouneyrac
d14f5265b2 MDL-43723 restrict the drag and drop to the move icon instead of dragging the entire block header 2014-02-17 09:16:53 +08:00
Sam Hemelryk
fa52e6494d Merge branch 'MDL-44042-master' of git://github.com/andrewnicols/moodle 
Conflicts:
	lib/yui/build/moodle-core-dragdrop/moodle-core-dragdrop-min.js
 2014-02-17 09:06:58 +13:00
Sam Hemelryk
87643ff599 Merge branch 'MDL-44079-master' of git://github.com/andrewnicols/moodle 
Conflicts:
	lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-min.js
 2014-02-17 08:48:39 +13:00
Sam Hemelryk
80ce7e1a8d Merge branch 'MDL-43979-master' of git://github.com/andrewnicols/moodle 2014-02-17 08:27:48 +13:00
Andrew Nicols
2ab0238ff6 MDL-44042 Javascript: Handle moving to the top of the current section with keyboard 2014-02-13 10:11:00 +08:00
Andrew Nicols
bc0477392b MDL-44079 Javascript: Closing a tooltip should pass event details 2014-02-11 12:17:53 +08:00
Andrew Nicols
bf24abd221 MDL-44079 Javascript: Check whether a dialogue is focused before closing 2014-02-11 12:17:52 +08:00