Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix image mapping in IE #1917

Merged
merged 3 commits into from
Dec 12, 2013
Merged

Fix image mapping in IE #1917

merged 3 commits into from
Dec 12, 2013

Conversation

polesye
Copy link
Contributor

@polesye polesye commented Dec 11, 2013

BLD-413

In the IE pos_x and pos_y are floats, but should be integers. Float numbers are not supported by regExp.
Additional rounding is added.

@valera-rozuvan , @auraz please review.

@auraz
Copy link
Contributor

auraz commented Dec 11, 2013

👍

@auraz
Copy link
Contributor

auraz commented Dec 11, 2013

please add comment why we use round

@@ -11,10 +11,10 @@ window.image_input_click = function(id,event){
iidiv = document.getElementById("imageinput_"+id);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In this file the variables iidiv, pos_x, pos_y, result, cx, and cy are leaked into the global namespace. Make sure that they are declared locally.

@valera-rozuvan
Copy link
Contributor

In line 1

window.image_input_click = function(id,event){

please include spaces after function, and after ',', and before '{'.

@valera-rozuvan
Copy link
Contributor

By the way, I think there are a lot of spaces messing = ) Before and after '+'. Before and after ':'. Before and after '?'. Before and after '-'.

= )

@valera-rozuvan
Copy link
Contributor

In comment

// click on image, return coordinates

there is a misleading statement that the function returns coordinates. Either update the comment, or return coordinates.

@polesye
Copy link
Contributor Author

polesye commented Dec 11, 2013

@valera-rozuvan and @auraz All comments are addressed. Please check.

result = "[" + Math.round(pos_x) + "," + Math.round(pos_y) + "]",
cx = (pos_x - 15) + "px",
cy = (pos_y - 15) + "px",
cross = document.getElementById("cross_" + id);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not

cross = $("#cross_" + id);

and then

cross.css({'left': cx, 'top': cy});

?

@valera-rozuvan
Copy link
Contributor

@polesye I think you should rewrite this file using jQuery. Follow the rule: "always check back in code in better state than you checked it out".

@auraz
Copy link
Contributor

auraz commented Dec 11, 2013

@valera-rozuvan next time maybe

@valera-rozuvan
Copy link
Contributor

👍 Good to merge. My last 2 comments are just little wishes. If you want to make me happy - you can fix them. = )

@polesye
Copy link
Contributor Author

polesye commented Dec 11, 2013

@valera-rozuvan I do not want to add additional dependency here.

@valera-rozuvan
Copy link
Contributor

@polesye In IE9 I get a very strange error - please see this screenshot. Do you think it is the browser responsible for it? Or is this behavior hard-coded into edx-platform JavaScript code base?

This happens when I click the Check button.

@valera-rozuvan
Copy link
Contributor

@polesye I have also checked Google Chrome on the same platform and with the same local edx-platform CMS setup. I am able to Check the answer, and it correctly identifies right and wrong placement of the green dot.

@polesye
Copy link
Contributor Author

polesye commented Dec 12, 2013

@valera-rozuvan Error in IE9 is not related to current PR.

@valera-rozuvan
Copy link
Contributor

@polesye I can no longer reproduce the bug when I click the Check button. I tried from fresh setup locally in VirtualBox, and also on SauceLabs. The green dot is behaves as expected, Check button also reveals correct and incorrect as expected.

👍 Good to merge.

polesye added a commit that referenced this pull request Dec 12, 2013
@polesye polesye merged commit 5eb0292 into master Dec 12, 2013
@polesye polesye deleted the anton/fix-imageresponse-in-ie branch December 12, 2013 11:58
jenkins-ks pushed a commit to nttks/edx-platform that referenced this pull request Jun 23, 2017
shimulch pushed a commit to open-craft/edx-platform that referenced this pull request Jan 26, 2021
* MCKIN-22396 Fix samesite cookie issue for Scorm Shell login flow (openedx#1879)

* Adds django-cookies-sameseite middleware

and settings to set SameSite=None for all secure cookies.

* Fix `SameSite` cookie issue for LTI Provider. EW-449

(cherry picked from commit 28479a2)

* Fix tests, conflicts resolved

Co-authored-by: Jillian Vogel <jill@opencraft.com>
Co-authored-by: Zachary Trabookis <ztraboo@clemson.edu>

* MCKIN-19584: add support for inline discussions translations (openedx#1863)

* MCKIN-19584: add support for inline discussions translations (openedx#1830)

* add support for inline discussions translations

* mark js string for translation on discussions

* ironwood fix

* MCKIN-19840 EOC (End of course Journal) - None of the strings are translated in any language (openedx#1857)

* MCKIN-19840 Add version bump for EOC 0.7.1 (openedx#1867)

* MCKIN-23062 purge cohorts of deleted groups

* MCKIN-23098 404 error on opening the module having EOC with no translations (openedx#1870)

* MCKIN-23098 404 error on opening the module having EOC with no translations integrated

* fix typo and chinese translation on discussions page (openedx#1875)

* Fix mismatching versions for api integration

* security fixes patch

* MCKIN-23604 Match fork code with upstream (openedx#1880)

* [MCKIN-21879] Remove foreign keys from deprecated `progress-edx-platform-extensions` (openedx#1874)

* MCKIN-22507 Updated GW submission API to accept TA email id (openedx#1871)

* MCKIN-22507 Updated GW submission API to accept TA email id

* Fixed typo

* MCKIN-22509 VB

* [MCKIN-22507] Review version bump for xblock-group-project-v2 (openedx#1887)

* MCKIN-22509 Added API to check/create anonymous user id (openedx#1882)

* MCKIN-23249 Threw error if any of group has submissions (openedx#1884)

* Added ignore condition for generated files

* Release freeze (openedx#1895)

* [MCKIN-21879] Remove foreign keys from deprecated `progress-edx-platform-extensions` (openedx#1874)

* MCKIN-22507 Updated GW submission API to accept TA email id (openedx#1871)

* MCKIN-22507 Updated GW submission API to accept TA email id

* Fixed typo

* MCKIN-22509 VB

* [MCKIN-22507] Review version bump for xblock-group-project-v2 (openedx#1887)

* MCKIN-22509 Added API to check/create anonymous user id (openedx#1882)

* MCKIN-23249 Threw error if any of group has submissions (openedx#1884)

* Added ignore condition for generated files

Co-authored-by: Piotr Surowiec <piotr@opencraft.com>
Co-authored-by: Nasir Hussain <nasirhjafri@gmail.com>
Co-authored-by: Sohaib Aslam <sohaib.aslam@arbisoft.com>
Co-authored-by: Shafqat Farhan <shafqat.farhan@arbisoft.com>

* Revert "[MCKIN-21879] Remove foreign keys from deprecated `progress-edx-platform-extensions` (openedx#1874)"

This reverts commit 5dad4f0.

* Revert "[MCKIN-21879] Remove foreign keys from deprecated `progress-edx-platform-extensions` (openedx#1874)"

This reverts commit 5dad4f0.

* MCKIN-23061 Fix enlarged buttons on studio (openedx#1892)

* Revert "Updated subsections grade percentage to start rounding"

This reverts commit fde830b.

* MCKIN-22514 problem builder verion bump

* [MCKIN-21879] Remove foreign keys from deprecated `progress-edx-platform-extensions`

* [BB-2765] Add `reverse_sql` to `database_fixups/0002` migration

* MCKIN-24492 version bump api-integration (openedx#1898)

* MCKIN-21527 Problem Builder (FTE, Assessment, MCQ, MRQ) - On opening these modules, none of the text is translated on notifications dropdown. (openedx#1889)

* MCKIN-21918 Inline discussion japanese buttons (openedx#1891)

Co-authored-by: murad-hubib <murad.habib@arbisoft.com>

* bump xblock problem-builder version to 3.5.1 (openedx#1899)

* MCKIN-24501 api-integration version bump (openedx#1903)

* Security patch from aug 26 (openedx#1894)

Co-authored-by: Ned Batchelder <ned@edx.org>

* sustaining xss security fixes 3 (openedx#1893)

Co-authored-by: Ali-D-Akbar <aliakbarit019@gmail.com>

* Sustaining security fixes 4 & 5 (openedx#1901)

Co-authored-by: Ali-D-Akbar <aliakbarit019@gmail.com>

* MCKIN-24663 sorting alphanumeric list (openedx#1908)

* MCKIN-24633 releasing problem builder v3.5.2 (openedx#1917)

* MCKIN-24559 - Organization extensions VB (openedx#1905)

Releasing `v2.0.6`

* MCKIN-24565 - Organizations extensions VB (openedx#1907)

Releasing `v2.0.7`

* MCKIN-24511 Projects extension VB (openedx#1915)

* Resolved conflits

* Resloved conflicts

* MCKIN-21919 Inline Discussion - The following strings are not translated in Korean Language (openedx#1906)

* Resolved conflict

* Resolved conflicts

* MCKIN-24633 releasing problem builder v3.5.2 (openedx#1917)

* MCKIN-25170 translation for review grade

* MCKIN-24296 missing translations added (openedx#1926)

* missing translations added (openedx#1927)

* MCKIN-25091 fixed Discussion post Anonymously (openedx#1925)

* VB for VR and eoc (openedx#1933)

* MCKIN-25752 discussion and question posted translations (openedx#1934)

* MCKIN-26123 Plateform Issues (openedx#1939)

* MCKIN-26123 Plateform Issues (openedx#1940)

* MCKIN-26123 Drag and Drop Version update (openedx#1942)

* MCKIN-23104 version upgrade of EOC journal (openedx#1941)

* MCKIN-26505 Version update of Problem Builder (openedx#1945)

* MCKIN-26123 Drag&Drop Version Update (openedx#1947)

* MCKIN-26589 Integrate translations of FIND DISCUSSIONS for main discussions page for all languages (openedx#1949)

* [v1.54.0] complied mo files

* compile js translations

* Fix unit tests and compile msgs js issue.

* Compile translations

Co-authored-by: Moeez Zahid <moeezzahid1996@gmail.com>
Co-authored-by: Jillian Vogel <jill@opencraft.com>
Co-authored-by: Zachary Trabookis <ztraboo@clemson.edu>
Co-authored-by: Saqib <msaqib52@gmail.com>
Co-authored-by: Wasif ur Rehman <wasifarbisoft@users.noreply.github.com>
Co-authored-by: Mudassir Hafeez <mudassir.hafeez@arbisoft.com>
Co-authored-by: Shafqat Farhan <shafqat.farhan@arbisoft.com>
Co-authored-by: ihtram <iulhaq@edx.org>
Co-authored-by: Piotr Surowiec <piotr@opencraft.com>
Co-authored-by: Nasir Hussain <nasirhjafri@gmail.com>
Co-authored-by: Sohaib Aslam <sohaib.aslam@arbisoft.com>
Co-authored-by: Agrendalath <piotr@surowiec.it>
Co-authored-by: Mudassir Hafeez <41048311+mudassir-hafeez@users.noreply.github.com>
Co-authored-by: murad-hubib <murad.habib@arbisoft.com>
Co-authored-by: Ned Batchelder <ned@edx.org>
Co-authored-by: Ali-D-Akbar <aliakbarit019@gmail.com>
Co-authored-by: Naeem Ilyas <naeem-ilyas@live.com>
Co-authored-by: Muhammad Usman <43761905+musmanmalik@users.noreply.github.com>
Co-authored-by: Mudassir Hafeez <mudasir5761@gmail.com>
Co-authored-by: ihtram <m.ihtram@arbisoft.com>
shimulch pushed a commit to open-craft/edx-platform that referenced this pull request Jan 26, 2021
* MCKIN-22396 Fix samesite cookie issue for Scorm Shell login flow (openedx#1879)

* Adds django-cookies-sameseite middleware

and settings to set SameSite=None for all secure cookies.

* Fix `SameSite` cookie issue for LTI Provider. EW-449

(cherry picked from commit 28479a2)

* Fix tests, conflicts resolved

Co-authored-by: Jillian Vogel <jill@opencraft.com>
Co-authored-by: Zachary Trabookis <ztraboo@clemson.edu>

* MCKIN-19584: add support for inline discussions translations (openedx#1863)

* MCKIN-19584: add support for inline discussions translations (openedx#1830)

* add support for inline discussions translations

* mark js string for translation on discussions

* ironwood fix

* MCKIN-19840 EOC (End of course Journal) - None of the strings are translated in any language (openedx#1857)

* MCKIN-19840 Add version bump for EOC 0.7.1 (openedx#1867)

* MCKIN-23062 purge cohorts of deleted groups

* MCKIN-23098 404 error on opening the module having EOC with no translations (openedx#1870)

* MCKIN-23098 404 error on opening the module having EOC with no translations integrated

* fix typo and chinese translation on discussions page (openedx#1875)

* Fix mismatching versions for api integration

* security fixes patch

* MCKIN-23604 Match fork code with upstream (openedx#1880)

* [MCKIN-21879] Remove foreign keys from deprecated `progress-edx-platform-extensions` (openedx#1874)

* MCKIN-22507 Updated GW submission API to accept TA email id (openedx#1871)

* MCKIN-22507 Updated GW submission API to accept TA email id

* Fixed typo

* MCKIN-22509 VB

* [MCKIN-22507] Review version bump for xblock-group-project-v2 (openedx#1887)

* MCKIN-22509 Added API to check/create anonymous user id (openedx#1882)

* MCKIN-23249 Threw error if any of group has submissions (openedx#1884)

* Added ignore condition for generated files

* Release freeze (openedx#1895)

* [MCKIN-21879] Remove foreign keys from deprecated `progress-edx-platform-extensions` (openedx#1874)

* MCKIN-22507 Updated GW submission API to accept TA email id (openedx#1871)

* MCKIN-22507 Updated GW submission API to accept TA email id

* Fixed typo

* MCKIN-22509 VB

* [MCKIN-22507] Review version bump for xblock-group-project-v2 (openedx#1887)

* MCKIN-22509 Added API to check/create anonymous user id (openedx#1882)

* MCKIN-23249 Threw error if any of group has submissions (openedx#1884)

* Added ignore condition for generated files

Co-authored-by: Piotr Surowiec <piotr@opencraft.com>
Co-authored-by: Nasir Hussain <nasirhjafri@gmail.com>
Co-authored-by: Sohaib Aslam <sohaib.aslam@arbisoft.com>
Co-authored-by: Shafqat Farhan <shafqat.farhan@arbisoft.com>

* Revert "[MCKIN-21879] Remove foreign keys from deprecated `progress-edx-platform-extensions` (openedx#1874)"

This reverts commit 5dad4f0.

* Revert "[MCKIN-21879] Remove foreign keys from deprecated `progress-edx-platform-extensions` (openedx#1874)"

This reverts commit 5dad4f0.

* MCKIN-23061 Fix enlarged buttons on studio (openedx#1892)

* Revert "Updated subsections grade percentage to start rounding"

This reverts commit fde830b.

* MCKIN-22514 problem builder verion bump

* [MCKIN-21879] Remove foreign keys from deprecated `progress-edx-platform-extensions`

* [BB-2765] Add `reverse_sql` to `database_fixups/0002` migration

* MCKIN-24492 version bump api-integration (openedx#1898)

* MCKIN-21527 Problem Builder (FTE, Assessment, MCQ, MRQ) - On opening these modules, none of the text is translated on notifications dropdown. (openedx#1889)

* MCKIN-21918 Inline discussion japanese buttons (openedx#1891)

Co-authored-by: murad-hubib <murad.habib@arbisoft.com>

* bump xblock problem-builder version to 3.5.1 (openedx#1899)

* MCKIN-24501 api-integration version bump (openedx#1903)

* Security patch from aug 26 (openedx#1894)

Co-authored-by: Ned Batchelder <ned@edx.org>

* sustaining xss security fixes 3 (openedx#1893)

Co-authored-by: Ali-D-Akbar <aliakbarit019@gmail.com>

* Sustaining security fixes 4 & 5 (openedx#1901)

Co-authored-by: Ali-D-Akbar <aliakbarit019@gmail.com>

* MCKIN-24663 sorting alphanumeric list (openedx#1908)

* MCKIN-24633 releasing problem builder v3.5.2 (openedx#1917)

* MCKIN-24559 - Organization extensions VB (openedx#1905)

Releasing `v2.0.6`

* MCKIN-24565 - Organizations extensions VB (openedx#1907)

Releasing `v2.0.7`

* MCKIN-24511 Projects extension VB (openedx#1915)

* Resolved conflits

* Resloved conflicts

* MCKIN-21919 Inline Discussion - The following strings are not translated in Korean Language (openedx#1906)

* Resolved conflict

* Resolved conflicts

* MCKIN-24633 releasing problem builder v3.5.2 (openedx#1917)

* MCKIN-25170 translation for review grade

* MCKIN-24296 missing translations added (openedx#1926)

* missing translations added (openedx#1927)

* MCKIN-25091 fixed Discussion post Anonymously (openedx#1925)

* VB for VR and eoc (openedx#1933)

* MCKIN-25752 discussion and question posted translations (openedx#1934)

* MCKIN-26123 Plateform Issues (openedx#1939)

* MCKIN-26123 Plateform Issues (openedx#1940)

* MCKIN-26123 Drag and Drop Version update (openedx#1942)

* MCKIN-23104 version upgrade of EOC journal (openedx#1941)

* MCKIN-26505 Version update of Problem Builder (openedx#1945)

* MCKIN-26123 Drag&Drop Version Update (openedx#1947)

* MCKIN-26589 Integrate translations of FIND DISCUSSIONS for main discussions page for all languages (openedx#1949)

* [v1.54.0] complied mo files

* MCKIN-24786 - api-integration version bump

* MCKIN-26967 - EOC VB

* MCKIN-23037 - Ooyala xblock version bump

* MCKIN-27119 - Missing strings added

* MCKIN-26468 - projects extensions VB (openedx#1951)

Releasing `v3.0.4`

* MCKIN-24382 Scorm VB (openedx#1966)

* Scorm VB

* MCKIN-26967 EOC VB

* MCKIN-24385: bump xblock diagnostic feedback version to v0.4.0 (openedx#1971)

* MCKIN-24468 McKA - Update Scorm xblock to Python 3.5 fix bug (openedx#1979)

* MCKIN-24385 bump xblock-diagnosticfeedback version to v0.4.1 (openedx#1987)

* MCKIN-26471 API integration VB (openedx#1995)

* bump xblock scorm version to v3.2.1 (openedx#1996)

* MCKIN-26850 EOC-journal version bump (openedx#2001)

* MCKIN-24383 & 24384 VB for GP v2 and Adventure (openedx#1961)

* MCKIN-24383 GW v2 version bump (openedx#2000)

* vb gp (openedx#2002)

* vb gp (openedx#2004)

* MCKIN-28139 Pinned pyopenssl version to 18.0.0

* vb gp (openedx#2004)

* MCKIN-28122 Traslations for all languages (openedx#2015)

* MCKIN-28123 vb gp (openedx#2018)

* Versions update.

Co-authored-by: Moeez Zahid <moeezzahid1996@gmail.com>
Co-authored-by: Jillian Vogel <jill@opencraft.com>
Co-authored-by: Zachary Trabookis <ztraboo@clemson.edu>
Co-authored-by: Saqib <msaqib52@gmail.com>
Co-authored-by: Wasif ur Rehman <wasifarbisoft@users.noreply.github.com>
Co-authored-by: Mudassir Hafeez <mudassir.hafeez@arbisoft.com>
Co-authored-by: Shafqat Farhan <shafqat.farhan@arbisoft.com>
Co-authored-by: ihtram <iulhaq@edx.org>
Co-authored-by: Piotr Surowiec <piotr@opencraft.com>
Co-authored-by: Nasir Hussain <nasirhjafri@gmail.com>
Co-authored-by: Sohaib Aslam <sohaib.aslam@arbisoft.com>
Co-authored-by: Agrendalath <piotr@surowiec.it>
Co-authored-by: Mudassir Hafeez <41048311+mudassir-hafeez@users.noreply.github.com>
Co-authored-by: murad-hubib <murad.habib@arbisoft.com>
Co-authored-by: Ned Batchelder <ned@edx.org>
Co-authored-by: Ali-D-Akbar <aliakbarit019@gmail.com>
Co-authored-by: Naeem Ilyas <naeem-ilyas@live.com>
Co-authored-by: Muhammad Usman <43761905+musmanmalik@users.noreply.github.com>
Co-authored-by: Mudassir Hafeez <mudasir5761@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants