Skip to content

Commit b05f780

Browse files
committed
[BUGFIX] Fix Bug #72754 - backend image editing is broken
Change MagnificPopup back to v 0.9.9
1 parent f314d22 commit b05f780

22 files changed

+377
-449
lines changed
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
Gemfile.lock
2+
test/dest
3+
*.gem
4+
pkg/
5+
*.swp
6+
*~
7+
_site/
8+
.bundle/
9+
.DS_Store
10+
bbin/
11+
sftp-config*
12+
_site
13+
.htaccess
14+
private-*
15+
__article/
16+
node_modules
17+
_production
18+
all.min.css
19+
.sublime-*
20+
website/dist/
21+
*.idea
22+
/.idea
23+
.node-version
24+
.sass-cache/

Resources/Public/Js/MagnificPopup/Gruntfile.js

Lines changed: 11 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -69,21 +69,16 @@ module.exports = function(grunt) {
6969
},
7070
jekyll: {
7171
dev: {
72-
options: {
73-
src: 'website',
74-
dest: '_site',
75-
url: 'local',
76-
raw: jekyllConfig + "url: local"
77-
}
72+
src: 'website',
73+
dest: '_site',
74+
url: 'local',
75+
raw: jekyllConfig + "url: local"
7876
},
7977
production: {
80-
options: {
81-
src: 'website',
82-
dest: '_production',
83-
url: 'production',
84-
raw: jekyllConfig + "url: production"
85-
}
86-
78+
src: 'website',
79+
dest: '_production',
80+
url: 'production',
81+
raw: jekyllConfig + "url: production"
8782
}
8883
},
8984

@@ -139,18 +134,8 @@ module.exports = function(grunt) {
139134
var files = this.data.src,
140135
includes = grunt.option('mfp-exclude'),
141136
basePath = this.data.basePath,
142-
newContents = this.data.banner + ";(function (factory) { \n" +
143-
"if (typeof define === 'function' && define.amd) { \n" +
144-
" // AMD. Register as an anonymous module. \n" +
145-
" define(['jquery'], factory); \n" +
146-
" } else if (typeof exports === 'object') { \n" +
147-
" // Node/CommonJS \n" +
148-
" factory(require('jquery')); \n" +
149-
" } else { \n" +
150-
" // Browser globals \n" +
151-
" factory(window.jQuery || window.Zepto); \n" +
152-
" } \n" +
153-
" }(function($) { \n";
137+
newContents = this.data.banner + ";(function($) {\n";
138+
154139

155140
if(includes) {
156141
includes = includes.split(/[\s,]+/); // 'a,b,c' => ['a','b','c']
@@ -184,7 +169,7 @@ module.exports = function(grunt) {
184169
newContents += grunt.file.read( basePath + name + '.js' ) + '\n';
185170
newContents += "\n/*>>"+name+"*/\n";
186171
});
187-
newContents+= " _checkInstance(); }));";
172+
newContents+= " _checkInstance(); })(window.jQuery || window.Zepto);";
188173

189174
grunt.file.write( this.data.dest, newContents );
190175
});

Resources/Public/Js/MagnificPopup/LICENSE

Lines changed: 0 additions & 20 deletions
This file was deleted.
Lines changed: 136 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,22 @@
11
# Magnific Popup Repository
22

3-
[![Build Status](https://travis-ci.org/dimsemenov/Magnific-Popup.png)](https://travis-ci.org/dimsemenov/Magnific-Popup)
4-
[![Flattr](http://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/thing/1310305/Magnific-Popup-by-dimsemenov)
3+
[![Build Status](https://travis-ci.org/dimsemenov/Magnific-Popup.png)](https://travis-ci.org/dimsemenov/Magnific-Popup)
54

65
Fast, light and responsive lightbox plugin, for jQuery and Zepto.js.
76

87
- [Documentation and getting started guide](http://dimsemenov.com/plugins/magnific-popup/documentation.html).
98
- [Examples and plugin home page](http://dimsemenov.com/plugins/magnific-popup/).
109
- More examples in [CodePen collection](http://codepen.io/collection/nLcqo).
1110

12-
Optionally, install via Bower `bower install magnific-popup` or npm: `npm install magnific-popup`.
13-
[Ruby gem](https://rubygems.org/gems/magnific-popup-rails): `gem install magnific-popup-rails`.
11+
Optionally, install via Bower: `bower install magnific-popup`.
1412

1513
## Extensions
1614

1715
- WordPress plugin - [under development](http://dimsemenov.com/plugins/magnific-popup/wordpress.html).
1816
- [Drupal module](https://drupal.org/project/magnific_popup).
19-
- [Concrete5 add-on](https://github.com/cdowdy/concrete5-Magnific-Popup).
20-
- [Redaxo add-on](http://www.redaxo.org/de/download/addons/?addon_id=1131).
21-
- [Contao extension](https://github.com/fritzmg/contao-magnific-popup).
17+
- [Ruby gem](https://rubygems.org/gems/magnific-popup-rails), `gem install magnific-popup-rails`.
2218

23-
If you created an extension for some CMS, email me and I'll add it to this list.
19+
If you created a popup extension for something, email me and I'll add it to this list.
2420

2521
## Location of stuff
2622

@@ -29,13 +25,6 @@ If you created an extension for some CMS, email me and I'll add it to this list.
2925
- Website (examples & documentation) is in folder [website/](https://github.com/dimsemenov/Magnific-Popup/tree/master/website).
3026
- Documentation page itself is in [website/documentation.md](https://github.com/dimsemenov/Magnific-Popup/blob/master/website/documentation.md) (contributions to it are very welcome).
3127

32-
33-
34-
## Using Magnific Popup?
35-
36-
If you used Magnific Popup in some interesting way, or on site of popular brand, I'd be very grateful if you <a href="mailto:[email protected]?subject="Site that uses Magnific Popup"">shoot me</a> a link to it.
37-
38-
3928
## Build
4029

4130
To compile Magnific Popup by yourself, first of make sure that you have [Node.js](http://nodejs.org/), [Grunt.js](https://github.com/cowboy/grunt), [Ruby](http://www.ruby-lang.org/) and [Jekyll](https://github.com/mojombo/jekyll/) installed, then:
@@ -58,13 +47,141 @@ Optionally:
5847
- If you don't have and don't want to install Jekyll, run `grunt nosite` to just build JS and CSS files related to popup in `dist/`.
5948

6049

50+
## Changelog
51+
52+
### 0.9.9 (Nov 15, 2013)
53+
54+
- Popup instance object is now available even before the first `$.fn.magnificPopup call`.
55+
- Methods `_onFocusIn` and `_setFocus` are now public, to allow overriding.
56+
57+
### 0.9.8 (Oct 26, 2013)
58+
59+
- Added figure and figcaption elements to image markup (#233, thanks to @pjackson28).
60+
- To avoid "jump" of content background, gap from right side (that "replaces" the scrollbar) is added with help of `margin`, instead of `padding`, (closes #125, thanks to @chodorowicz).
61+
- Function that checks if the clicked element should close popup or not is now public (so it <a href="http://dimsemenov.com/plugins/magnific-popup/documentation.html#how_to_override_some_function_without_modifying_the_source_files">can be overridden with your own logic</a>).
62+
- Working on a new module: the exact copy of native fullscreen Android/iOS gallery, with touch/zoom/pan e.t.c., will publish branch soon (&copy;Blizzard).
63+
64+
### 0.9.7 (Oct 10, 2013)
65+
66+
- CSS: removed outline on buttons (thanks to @OriginalEXE).
67+
- Allow multiple string tokens to be passed in gallery variables like `%curr% of %total%` and `%title%` (#234, thanks to Petr Marek).
68+
- A few small changes to Grunt build, `grunt-contrib-sass` > `grunt-sass`. (thanks to @nschonni).
69+
70+
### 0.9.6 (Sep 29, 2013)
71+
72+
- Fixed bug: options object that you pass to popup gets modified after the initialization (#217, #203).
73+
- Fixed bug: zoom module creates global variable (#226).
74+
- Fixed bug: gallery from AJAX popups stacks content if it's switched before loading has finished.
75+
- Indented and combined SCSS classes (thanks to @nschonni).
76+
- `$.magnificPopup.close()` now doesn't throw an exception if there's no instance (#221, thanks to @mjlescano).
77+
78+
### 0.9.5 (Aug 21, 2013)
79+
80+
- Fixed bug: built-in tab focus in popup works incorrectly (caused by 0.9.3 update).
81+
82+
### 0.9.4 (Aug 7, 2013)
83+
84+
- Fixed bug: error in IE7 when minified version of script is used with some versions of jQuery, #156.
85+
- Fixed bug: DOM exception in Chrome when using gallery mode with some versions of jQuery, #177.
86+
87+
### 0.9.3 (Jul 16, 2013)
88+
89+
- Fixed blurry arrows in FF (#142)
90+
- Added `lazyLoadError` callback.
91+
- Popup now prevents closing if the clicked element is remvoved from DOM.
92+
- `overflow:hidden` is now applied to `html` instead of `body`.
93+
- Increased default z-index to from 500 to 1040.
94+
95+
### 0.9.2 (Jul 5, 2013)
96+
97+
- Fixed bug in new zoom module, that could cause incorrect calculation of image height, when jQuery is used instead of Zepto.
98+
99+
### 0.9.1 (Jul 4, 2013)
100+
101+
- Added zoom module effect for images, go to Magnific Popup [website](http://dimsemenov.com/plugins/magnific-popup/) to view demos. More info in [docs](http://dimsemenov.com/plugins/magnific-popup/documentation.html#zoom_effect).
102+
- `removalDelay` now applies only when browser supports CSS transitions.
103+
- Fix: removed tiny blink when switching between gallery images, or opening images that are already cached.
104+
- Changed the default appearance of gallery arrows (now its white triangle with black border, was vice-versa).
105+
- Added solid background to the image when its loading.
106+
107+
108+
109+
110+
### 0.9.0 (Jul 3, 2013)
111+
112+
- Added `modal` option which disables all default ways to close the popup, learn more in [docs](http://dimsemenov.com/plugins/magnific-popup/documentation.html#modal). Thanks to [Julen Ruiz Aizpuru](https://github.com/julen).
113+
- Added `beforeClose` event.
114+
- Added `imageLoadComplete` event.
115+
- Removed jQuery event alias calls. Thanks to [Albert Casademont](https://github.com/acasademont).
116+
- Cleaned some duplicate styles in CSS. Thanks to [Yann Abgrall](https://github.com/yannabgrall).
117+
118+
### 0.8.9 (Jun 4, 2013)
119+
120+
- Fix: inline element that is created dynamically causes exception in jQuery 1.8.x.
121+
- Fix: incorrect detection of `_hasScrollBar` if body has defined height style.
122+
- Fix: body styles are kept after popup is closed.
123+
- Fix: close icon is aligned incorrectly with iframe type.
124+
- **responseText is deprected**. Argument of callback `parseAjax` - `obj.responseText` is now deprected, but you can still access it via `obj.xhr.responseText`. Instead of it, please use `obj.data` to modify your output.
125+
- Sass: changed variables to be default declarations to support front-loaded settings. i.e. You can override options by adding `_settings.scss` file near `main.scss` with your new options.
126+
- Added: `afterClose` event.
127+
- Added: `ajaxContentLoaded` event.
128+
- Added: [Bower](https://github.com/bower/bower) support.
129+
130+
### 0.8.8 (May 24, 2013)
131+
132+
- Fix: you can now put link inside popup that will open another popup - http://codepen.io/dimsemenov/pen/hwIng
133+
- Fix: incorrect index when opening popup that is already opened from multiple DOM elements.
134+
135+
### 0.8.7 (May 19, 2013)
136+
137+
- Fixed #62 - IE9 HTML5 YouTube player playing audio after pop up closed
138+
139+
### 0.8.6 (May 18, 2013)
140+
141+
- Controls are now removed when there is only one element in gallery.
142+
- Fixed issue that could cause incorrect main event element.
143+
- Public property `items` is now always an array (previously it could be jQuery object collection).
144+
- Added `word-break: break-word` to caption.
145+
146+
### 0.8.5 (May 15, 2013)
147+
148+
- Fix #43 - In IE8 whole window becomes black when YouTube iframe is
149+
closed.
150+
- Fix #51 - In IE9 YouTube HTML5 video keeps playing after iframe is
151+
removed from page.
152+
- Bugfix - box-sizing on IMG in low IE behaves incorrectly.
153+
- Fix #57 - padding on body is not added with overflowY:'scroll'.
154+
- removalDelay option is now ignored in IE.
155+
- Added an option closeOnBgClick.
156+
- Added BeforeChange callback.
157+
- Added AfterChange callback.
158+
159+
### 0.8.4 (May 13, 2013)
160+
161+
- You can now call any public method directly from jQuery DOM element, e.g.: `$('.some-el-with-popup').magnificPopup('methodName', /*, arguments */)`.
162+
- Optimized inline module. Now target element is replaced with placeholder only when it has a defined parent node.
163+
- `inline` type is now set as a default, so you may skip it.
164+
- Now content is just replaced when you call `open()` on popup that is already opened.
165+
166+
167+
### 0.8.3 (May 9, 2013)
168+
169+
- Added: `goTo` public method.
170+
- Custom events that are added to popup are now not lost when navigating through gallery.
171+
- If `delegate` option is used, events are now dispatched on main element instead of children.
172+
173+
174+
### 0.8.2 (May 5, 2013)
175+
176+
- Added !important to mfp-hide class.
177+
- Fix gallery rendering issue in Opera.
178+
- Fix padding to body with overflow:scroll.
179+
180+
61181

62-
## [Changelog](https://github.com/dimsemenov/Magnific-Popup/releases)
63182

64183
## License
65184

66185
Script is MIT licensed and free and will always be kept this way. But has a small restriction from me - please do not create public WordPress plugin based on it(or at least contact me before creating it), because I will make it and it'll be open source too ([want to get notified?](http://dimsemenov.com/subscribe.html)).
67186

68-
Created by [@dimsemenov](http://twitter.com/dimsemenov) & [contributors](https://github.com/dimsemenov/Magnific-Popup/contributors).
69-
70-
[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/dimsemenov/magnific-popup/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
187+
Created by [@dimsemenov](http://twitter.com/dimsemenov) & [contributors](https://github.com/dimsemenov/Magnific-Popup/contributors).

Resources/Public/Js/MagnificPopup/bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "magnific-popup",
3-
"version": "1.0.0",
3+
"version": "0.9.9",
44
"main": [
55
"dist/jquery.magnific-popup.js",
66
"dist/magnific-popup.css"

Resources/Public/Js/MagnificPopup/composer.json

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)