Commit graph

64 commits

Author SHA1 Message Date
Colby Gutierrez-Kraybill
6cb37e0691 Change HTTP → HTTPS
Now that github pages supports HTTPS
2018-05-01 19:22:12 -04:00
Christopher Willis-Ford
5a1a103ffb Ensure extensions don't load until editor is ready
Prior to this change, there were two versions of the code meant to load
extensions from URL query parameters:
- One version reliably waited for the editor to be ready, but looked for
  "ext=" and "proj=" query parameters. This was an old version of the
  JS-Flash interface that was never documented; the docs say to use
  "url=" for both projects and extensions.
- The other version correctly looked for "url=" but did not reliably
  wait for the editor to be ready. This seems to be the most likely
  culprit for reports that extensions sometimes fail to load.

This change unifies those two paths into one which looks for "url=" and
waits for the editor to be ready.
2017-03-15 14:27:50 -07:00
Christopher Willis-Ford
e2455a0609 Fix GH-103: Create SWF regardless of platform
Port LLK/scratchr2#4168 for ScratchX.

Original description from that change:
> This fixes  by creating the swf regardless of OS and browser.
> Calling `embedSWF` would first check for the existence of the plugin
> before creating, causing browsers that don’t allow the flash plugin by
> default to not be able to show their “allow” message. This tries to
> create the swf no matter what, allowing browsers to detect flash
> themselves.
>
> Logic is as follows:
> 1. check if `userAgent` returns a mobile/tablet OS. Display error
>    message if so
> 2. check if on windows and using ie – check for an express install if
>    so (like in `embedSWF`)
> 3. load the swf in all other cases, let browsers handle it.
>
> Test Cases:
> - Test how project pages load in Android and iOS devices, on tablets
>   and on phones, and on multiple desktop OS's for correct loading
>   behavior.

This resolves 
2017-01-04 13:56:12 -08:00
Ray Schamp
3b51d345cf Fix error when closing modals
Helps with  
2015-11-25 13:31:47 -05:00
Ray Schamp
c788ab649e Don't return the jQuery element when showing a warning
Hopefully this fixes a recursion issue for @khanning.  Sometimes returning jQuery objects to Flash causes issues in the serialization step.
2015-08-14 09:22:56 -04:00
Ray Schamp
b70f58a1f5 Update extension warning dialog to match others
Also clean up the unnecessary stuff in the dialog JS/CSS now that it's working better
2015-08-11 15:10:05 -04:00
Ray Schamp
3be27931f3 Fix modal closing in the hackiest way ever 2015-08-10 16:29:47 -04:00
Ray Schamp
48121a694f Match the homepage comp more closely 2015-08-10 09:45:39 -04:00
Ray Schamp
06e5019760 Allow modals of several elements 2015-08-10 09:45:39 -04:00
Ray Schamp
70a5f49d9d Open the editor when loading from URL params 2015-05-15 10:10:18 -04:00
Ray Schamp
f12635d2b3 Fix shortURL redirection 2015-05-15 10:09:58 -04:00
Ray Schamp
38c584cb00 Remove excess space 2015-05-15 09:56:15 -04:00
Ray Schamp
7a9721f466 Track fragments 2015-05-15 09:52:35 -04:00
Ray Schamp
dba9d08dc8 Track extensions loaded 2015-05-14 17:21:56 -04:00
Ray Schamp
0f66f238e3 Set referrer when changing pages 2015-05-14 17:21:19 -04:00
Ray Schamp
2c0c8f2993 Add Google Analytics 2015-05-14 14:31:54 -04:00
Ray Schamp
d6bfd1bf51 Fix setting page on load 2015-05-14 14:21:08 -04:00
Ray Schamp
eabdf0911b Refactor event handling
Fixes , and some unfiled issues:
Loading extensions from the home page now pop up the warning modal
Clicking the "back to home" button from the warning modal returns you to home.
Each time a modal is created, the number of event handlers no longer doubles :|
2015-05-14 14:08:36 -04:00
Ray Schamp
cfc57f3cf5 Handle all static links through hashchange
Fixes 
2015-05-13 14:27:36 -04:00
Ray Schamp
c07409ab54 Reset editor when entering it unless already shown 2015-05-12 15:49:53 -04:00
Ray Schamp
61771f51e6 Revert "Update key"
This reverts commit 19fb46cbb3.
2015-05-12 15:49:53 -04:00
Ray Schamp
8a84040be9 Ensure history state change on showPage
Fix 
2015-05-11 10:40:48 -04:00
Ray Schamp
19fb46cbb3 Update key 2015-05-11 10:18:15 -04:00
Ray Schamp
7532922dba Scratch itch
Be a little more direct about things
2015-05-11 10:18:15 -04:00
Ray Schamp
295ecff723 Add methods to set/show/get short urls 2015-05-11 10:18:15 -04:00
Ray Schamp
4507777c36 Revert "Trigger page changes with hashchange. Fix back button"
This reverts commit b184d78c3f.

Conflicts:
	js/scratchx.js
2015-05-08 21:39:43 -04:00
Ray Schamp
8b748a9604 Ensure modals attach listeners to contents 2015-05-08 21:18:44 -04:00
Ray Schamp
73daea9c43 Don't pass Arguments object directly to Flash 2015-05-08 20:48:53 -04:00
Ray Schamp
0275d338cc Pass a list of urls to Flash 2015-05-08 20:07:05 -04:00
Ray Schamp
aa3842d36b Add warning modal 2015-05-08 18:53:57 -04:00
Ray Schamp
b184d78c3f Trigger page changes with hashchange. Fix back button 2015-05-08 18:44:45 -04:00
Ray Schamp
0744483ca2 Merge branch 'fix_back_to_home' of github.com:LLK/scratchx into gh-pages 2015-05-08 18:30:43 -04:00
Shane M. Clements
28ee71b70a Show the home page when you hit the back button to go back to it. 2015-05-08 16:24:12 -06:00
Ray Schamp
ed378ecb77 Tweaks with @carljbowman 2015-05-08 15:34:00 -04:00
Ray Schamp
b72824f960 Remove Flash overlay when exiting modals 2015-05-08 13:35:54 -04:00
Ray Schamp
9e1d73f3ab Revert shorturl experiment
This reverts commit 8215420eee.

Conflicts:
	js/scratchx.js
2015-05-08 10:13:34 -04:00
Ray Schamp
cfb9aad71d Cleanup 2015-05-08 10:10:04 -04:00
Ray Schamp
fa65c81b39 Fix the string sent by data-action="load-url" links 2015-05-08 10:09:55 -04:00
Ray Schamp
e261eb0cdf Close modals with escape key 2015-05-08 10:09:16 -04:00
Ray Schamp
dc86deb551 Make event handlers attach to elements in modals 2015-05-08 10:08:20 -04:00
Ray Schamp
90870e6701 Rename swf object id back to scratch 2015-05-08 10:06:50 -04:00
Ray Schamp
8215420eee Take a not so serious crack at short URLs 2015-05-07 19:03:41 -04:00
Ray Schamp
bf52f90457 Fix the little jump when you go to #home etc. 2015-05-07 18:06:28 -04:00
Ray Schamp
505e23beac Don't go to pages that don't exist 2015-05-07 17:06:58 -04:00
Ray Schamp
30e6bb0828 Use modal Refill for popovers. Add JSshowExtensionDialog 2015-05-07 17:06:46 -04:00
Ray Schamp
c0b538de72 Add popover functionality 2015-05-07 11:00:47 -04:00
Ray Schamp
b8d142006d Add some comments 2015-05-06 20:44:24 -04:00
Ray Schamp
78764b539e Use non-caveman event handlers 2015-05-06 20:25:42 -04:00
Ray Schamp
15daacc8e9 Unredundantize static link method 2015-05-06 19:56:15 -04:00
Ray Schamp
06e031cdc8 Allow loading URLs from links 2015-05-06 19:55:28 -04:00