Collapse-O-Matic - Version 1.5.10

Version Description

  • change the find me element from an anchor to an input due to HTML5 no longer supporting the Name attribute
  • fixed bug with trigpos inline
  • added span_fix classes to css files
  • added 4.0 icons to assets
Download this release

Release Info

Developer baden03
Plugin Icon 128x128 Collapse-O-Matic
Version 1.5.10
Comparing to
See all releases

Code changes from version 1.5.9 to 1.5.10

Files changed (6) hide show
  1. collapse-o-matic.php +5 -5
  2. dark_style.css +7 -0
  3. js/collapse.js +5 -5
  4. languages/colomat_ru.po +78 -96
  5. light_style.css +8 -1
  6. readme.txt +13 -2
collapse-o-matic.php CHANGED
@@ -5,7 +5,7 @@ Text Domain: colomat
5
  Domain Path: /languages
6
  Plugin URI: http://plugins.twinpictures.de/plugins/collapse-o-matic/
7
  Description: Collapse-O-Matic adds an [expand] shortcode that wraps content into a lovely, jQuery collapsible div.
8
- Version: 1.5.9
9
  Author: twinpictures, baden03
10
  Author URI: http://twinpictures.de/
11
  License: GPL2
@@ -23,7 +23,7 @@ class WP_Collapse_O_Matic {
23
  * Current version
24
  * @var string
25
  */
26
- var $version = '1.5.9';
27
 
28
  /**
29
  * Used as prefix for options entry
@@ -106,7 +106,7 @@ class WP_Collapse_O_Matic {
106
  if($this->options['script_location'] == 'footer' ){
107
  $load_in_footer = true;
108
  }
109
- wp_register_script('collapseomatic-js', plugins_url('js/collapse.js', __FILE__), array('jquery'), '1.5.10', $load_in_footer);
110
  if( empty($this->options['script_check']) ){
111
  wp_enqueue_script('collapseomatic-js');
112
  }
@@ -231,12 +231,12 @@ class WP_Collapse_O_Matic {
231
  if($findme != 'true' && $findme != 'auto'){
232
  $offset = $findme;
233
  }
234
- $anchor = '<a id="find-'.$id.'" name="'.$offset.'"> </a>';
235
  }
236
  $closeanchor = '';
237
  if($scrollonclose && (is_numeric($scrollonclose) || $scrollonclose == 0)){
238
  $trigclass .= ' scroll-to-trigger';
239
- $closeanchor = '<a id="scrollonclose-'.$id.'" name="'.$scrollonclose.'"> </a>';
240
  }
241
  $link = $closeanchor.$anchor.'<'.$tag.' class="collapseomatic '.$trigclass.'" id="'.$id.'" '.$relatt.' '.$altatt.'>'.$startwrap.$title.$endwrap.'</'.$tag.'>';
242
  if($swaptitle){
5
  Domain Path: /languages
6
  Plugin URI: http://plugins.twinpictures.de/plugins/collapse-o-matic/
7
  Description: Collapse-O-Matic adds an [expand] shortcode that wraps content into a lovely, jQuery collapsible div.
8
+ Version: 1.5.10
9
  Author: twinpictures, baden03
10
  Author URI: http://twinpictures.de/
11
  License: GPL2
23
  * Current version
24
  * @var string
25
  */
26
+ var $version = '1.5.10';
27
 
28
  /**
29
  * Used as prefix for options entry
106
  if($this->options['script_location'] == 'footer' ){
107
  $load_in_footer = true;
108
  }
109
+ wp_register_script('collapseomatic-js', plugins_url('js/collapse.js', __FILE__), array('jquery'), '1.5.11', $load_in_footer);
110
  if( empty($this->options['script_check']) ){
111
  wp_enqueue_script('collapseomatic-js');
112
  }
231
  if($findme != 'true' && $findme != 'auto'){
232
  $offset = $findme;
233
  }
234
+ $anchor = '<input type="hidden" id="find-'.$id.'" name="'.$offset.'"/>';
235
  }
236
  $closeanchor = '';
237
  if($scrollonclose && (is_numeric($scrollonclose) || $scrollonclose == 0)){
238
  $trigclass .= ' scroll-to-trigger';
239
+ $closeanchor = '<input type="hidden" id="scrollonclose-'.$id.'" name="'.$scrollonclose.'"/>';
240
  }
241
  $link = $closeanchor.$anchor.'<'.$tag.' class="collapseomatic '.$trigclass.'" id="'.$id.'" '.$relatt.' '.$altatt.'>'.$startwrap.$title.$endwrap.'</'.$tag.'>';
242
  if($swaptitle){
dark_style.css CHANGED
@@ -36,4 +36,11 @@
36
  position: absolute !important;
37
  left: -10000px !important;
38
  display:block !important;
 
 
 
 
 
 
 
39
  }
36
  position: absolute !important;
37
  left: -10000px !important;
38
  display:block !important;
39
+ }
40
+ .span_fix {
41
+ padding: 0 !important;
42
+ margin: 0 !important;
43
+ }
44
+ .span_fix:before, .span_fix:after {
45
+ content: none;
46
  }
js/collapse.js CHANGED
@@ -1,5 +1,5 @@
1
  /*!
2
- * Collapse-O-Matic JavaSctipt v1.5.10
3
  * http://plugins.twinpictures.de/plugins/collapse-o-matic/
4
  *
5
  * Copyright 2014, Twinpictures
@@ -70,8 +70,8 @@ function toggleState (obj, id, maptastic, trig_id) {
70
  if(colomatslideEffect == 'slideToggle'){
71
  jQuery('[id^=target][id$='+id+']').slideToggle(colomatduration, function() {
72
  // Animation complete.
73
- if( obj.hasClass('colomat-inline') && obj.is(':visible') ){
74
- obj.css('display', 'inline');
75
  }
76
 
77
  //deal with any findme links
@@ -92,8 +92,8 @@ function toggleState (obj, id, maptastic, trig_id) {
92
  opacity: "toggle"
93
  }, colomatduration, function (){
94
  //Animation complete
95
- if( obj.hasClass('colomat-inline') && obj.is(':visible') ){
96
- obj.css('display', 'inline');
97
  }
98
 
99
  //deal with any findme links
1
  /*!
2
+ * Collapse-O-Matic JavaSctipt v1.5.11
3
  * http://plugins.twinpictures.de/plugins/collapse-o-matic/
4
  *
5
  * Copyright 2014, Twinpictures
70
  if(colomatslideEffect == 'slideToggle'){
71
  jQuery('[id^=target][id$='+id+']').slideToggle(colomatduration, function() {
72
  // Animation complete.
73
+ if( jQuery(this).hasClass('colomat-inline') && jQuery(this).is(':visible') ){
74
+ jQuery(this).css('display', 'inline');
75
  }
76
 
77
  //deal with any findme links
92
  opacity: "toggle"
93
  }, colomatduration, function (){
94
  //Animation complete
95
+ if( jQuery(this).hasClass('colomat-inline') && jQuery(this).is(':visible') ){
96
+ jQuery(this).css('display', 'inline');
97
  }
98
 
99
  //deal with any findme links
languages/colomat_ru.po CHANGED
@@ -2,140 +2,122 @@
2
  # This file is distributed under the same license as the Collapse-O-Matic package.
3
  msgid ""
4
  msgstr ""
5
- "PO-Revision-Date: 2013-11-19 08:16+0100\n"
6
  "MIME-Version: 1.0\n"
7
  "Content-Type: text/plain; charset=UTF-8\n"
8
  "Content-Transfer-Encoding: 8bit\n"
9
- "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
10
- "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
11
- "X-Generator: Poedit 1.5.7\n"
12
  "Project-Id-Version: Collapse-O-Matic\n"
13
- "POT-Creation-Date: \n"
14
- "Last-Translator: astroBro <baden@twinpictures.de>\n"
15
- "Language-Team: Twinpictures <info@twinpictures.de>\n"
16
- "Language: Russian\n"
17
 
18
- #: colomat.php:287
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
19
  msgid "Style"
20
  msgstr "Стиль"
21
 
22
- #: colomat.php:294
23
  msgid "Light"
24
  msgstr "Светлый"
25
 
26
- #: colomat.php:295
27
  msgid "Dark"
28
  msgstr "Темный"
29
 
30
- #: colomat.php:306
31
- msgid ""
32
- "Select Light for sites with lighter backgroudns. Select Dark for sites with "
33
- "darker backgrounds."
34
- msgstr ""
35
- "Выберите Светлый стиль для сайтов со светлым фоном. Темный для сайтов с "
36
- "темным."
37
-
38
- #: colomat.php:275 colomat.php:373
39
  msgid "Click to toggle"
40
  msgstr "Нажмите, что бы переключить"
41
 
42
- #: colomat.php:276
43
  msgid "Default Collapse-O-Matic Settings"
44
  msgstr "Настройки по умолчанию для Collapse-O-Matic"
45
 
46
- #: colomat.php:311
47
  msgid "Tag Attribute"
48
  msgstr "Атрибут Тега"
49
 
50
- #: colomat.php:313
51
- msgid ""
52
- "HTML tag use to wrap the trigger text. See %sTag Attribute%s in the "
53
- "documentation for more info."
54
- msgstr ""
55
 
56
- #: colomat.php:323
57
  msgid "Collapse/Expand Duration"
58
- msgstr ""
59
 
60
- #: colomat.php:325
61
- msgid ""
62
- "A string or number determining how long the animation will run. See "
63
- "%sDuration%s in the documentation for more info."
64
- msgstr ""
65
 
66
- #: colomat.php:330
67
  msgid "Animation Effect"
68
- msgstr ""
69
 
70
- #: colomat.php:337
71
  msgid "Slide Only"
72
- msgstr ""
73
 
74
- #: colomat.php:338
75
  msgid "Slide & Fade"
76
- msgstr ""
77
 
78
- #: colomat.php:349
79
- msgid ""
80
- "Animation effect to use while collapsing and expanding. See %sAnimation "
81
- "Effect%s in the documentation for more info."
82
- msgstr ""
83
 
84
- #: colomat.php:354
85
  msgid "Level Up!"
86
- msgstr ""
87
 
88
- #: colomat.php:355
89
- msgid ""
90
- "<em>Comming Soon: Collapse-Pro-Matic</em> our preimum plugin that offers "
91
- "additional attributes and the ability to set default attribute settings for "
92
- "all attributes."
93
- msgstr ""
94
-
95
- #: colomat.php:362
96
  msgid "Save Changes"
97
- msgstr ""
98
 
99
- #: colomat.php:374
100
  msgid "About"
101
- msgstr ""
102
-
103
- #: colomat.php:377
104
- msgid ""
105
- "Remove clutter, save space. Display and hide additional content in a SEO "
106
- "friendly way. Wrap any content&mdash;including other shortcodes&mdash;into a "
107
- "lovely jQuery expanding and collapsing element."
108
- msgstr ""
109
-
110
- #: colomat.php:379
111
- msgid ""
112
- "%sDetailed documentation%s, complete with working demonstrations of all "
113
- "shortcode attributes, is available for your instructional enjoyment."
114
- msgstr ""
115
-
116
- #: colomat.php:380
117
- msgid "%sFree%s & %sPremimum%s Support"
118
- msgstr ""
119
 
120
- #: colomat.php:381
121
- msgid ""
122
- "If you like this plugin, please consider %sreviewing it at WordPress.org%s "
123
- "to help others."
124
- msgstr ""
125
-
126
- msgid "jQuery Collapse-O-Matic"
127
- msgstr ""
128
-
129
- msgid "http://plugins.twinpictures.de/plugins/collapse-o-matic/"
130
- msgstr ""
131
 
132
- msgid ""
133
- "Collapse-O-Matic adds an [expand] shortcode that wraps content into a "
134
- "lovely, jQuery collapsible div."
135
- msgstr ""
136
-
137
- msgid "twinpictures, baden03"
138
- msgstr ""
139
-
140
- msgid "http://twinpictures.de/"
141
- msgstr ""
2
  # This file is distributed under the same license as the Collapse-O-Matic package.
3
  msgid ""
4
  msgstr ""
5
+ "PO-Revision-Date: 2014-09-22 10:05:12+0000\n"
6
  "MIME-Version: 1.0\n"
7
  "Content-Type: text/plain; charset=UTF-8\n"
8
  "Content-Transfer-Encoding: 8bit\n"
9
+ "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
10
+ "X-Generator: GlotPress/0.1\n"
 
11
  "Project-Id-Version: Collapse-O-Matic\n"
 
 
 
 
12
 
13
+ #: collapse-o-matic.php:383
14
+ msgid "Shortcode Loads Scripts"
15
+ msgstr "Шорт-код загружает скрипт"
16
+
17
+ #: collapse-o-matic.php:384
18
+ msgid "Only load scripts with shortcode."
19
+ msgstr "Только загрузка скриптов с шорткодом."
20
+
21
+ #: collapse-o-matic.php:385
22
+ msgid "Only load Collapse-O-Matic scripts if [expand] shortcode is used."
23
+ msgstr "Если используется шорт-код [expand], загружает только скрипты Collapse-O-Matic"
24
+
25
+ #: collapse-o-matic.php:391
26
+ msgid "%sCollapse-Pro-Matic%s is our preimum plugin that offers additional attributes and features for <i>ultimate</i> flexibility."
27
+ msgstr "%sCollapse-Pro-Matic%s - наш премиум плагин, который предлагает дополнительные атрибуты и функции для <i>максимальной</i> гибкости."
28
+
29
+ #: collapse-o-matic.php:416
30
+ msgid "%sFree%s Opensource Support"
31
+ msgstr "%sБесплатно%s Открытый код Поддержка"
32
+
33
+ #: collapse-o-matic.php:417
34
+ msgid "If this plugin %s, please consider %sreviewing it at WordPress.org%s to help others."
35
+ msgstr "Если этот плагин %s, почему бы не %sнаписать обзор на WordPress.org%s , чтобы помочь другим."
36
+
37
+ #: collapse-o-matic.php:277
38
+ msgid "Settings"
39
+ msgstr "Настройки"
40
+
41
+ #: collapse-o-matic.php:328
42
+ msgid "Select Light for sites with lighter backgrounds. Select Dark for sites with darker backgrounds."
43
+ msgstr "Выберите Светлый для сайтов с более светлым фоном. Выберите Темный для сайтов с более темным фоном."
44
+
45
+ #: collapse-o-matic.php:376
46
+ msgid "Custom Style"
47
+ msgstr "Пользовательский стиль"
48
+
49
+ #: collapse-o-matic.php:378
50
+ msgid "Custom CSS style for <em>ultimate flexibility</em>"
51
+ msgstr "Пользовательская таблица стилей CSS для <em>наибольшей гибкости</em>"
52
+
53
+ #: collapse-o-matic.php:309
54
  msgid "Style"
55
  msgstr "Стиль"
56
 
57
+ #: collapse-o-matic.php:316
58
  msgid "Light"
59
  msgstr "Светлый"
60
 
61
+ #: collapse-o-matic.php:317
62
  msgid "Dark"
63
  msgstr "Темный"
64
 
65
+ #: collapse-o-matic.php:297 collapse-o-matic.php:409
 
 
 
 
 
 
 
 
66
  msgid "Click to toggle"
67
  msgstr "Нажмите, что бы переключить"
68
 
69
+ #: collapse-o-matic.php:298
70
  msgid "Default Collapse-O-Matic Settings"
71
  msgstr "Настройки по умолчанию для Collapse-O-Matic"
72
 
73
+ #: collapse-o-matic.php:333
74
  msgid "Tag Attribute"
75
  msgstr "Атрибут Тега"
76
 
77
+ #: collapse-o-matic.php:335
78
+ msgid "HTML tag use to wrap the trigger text. See %sTag Attribute%s in the documentation for more info."
79
+ msgstr "HTML-теги используемые, чтобы обернуть текст триггера. См. %sTag Attribute%s в документации для получения дополнительной информации."
 
 
80
 
81
+ #: collapse-o-matic.php:345
82
  msgid "Collapse/Expand Duration"
83
+ msgstr "Продолжительность Свертывания/Развертывания"
84
 
85
+ #: collapse-o-matic.php:347
86
+ msgid "A string or number determining how long the animation will run. See %sDuration%s in the documentation for more info."
87
+ msgstr "Строка или число, определяющие, как долго будет работать анимация. См. %sDuration%s в документации для получения дополнительной информации."
 
 
88
 
89
+ #: collapse-o-matic.php:352
90
  msgid "Animation Effect"
91
+ msgstr "Эффект анимации "
92
 
93
+ #: collapse-o-matic.php:359
94
  msgid "Slide Only"
95
+ msgstr "Только скольжение"
96
 
97
+ #: collapse-o-matic.php:360
98
  msgid "Slide & Fade"
99
+ msgstr "Скольжение и выцветание"
100
 
101
+ #: collapse-o-matic.php:371
102
+ msgid "Animation effect to use while collapsing and expanding. See %sAnimation Effect%s in the documentation for more info."
103
+ msgstr "Эффект анимации, который используется при свертывании и развертывании. См. %sAnimation Effect%s в документации для получения дополнительной информации."
 
 
104
 
105
+ #: collapse-o-matic.php:390
106
  msgid "Level Up!"
107
+ msgstr "Повысить уровень!"
108
 
109
+ #: collapse-o-matic.php:398
 
 
 
 
 
 
 
110
  msgid "Save Changes"
111
+ msgstr "Сохранить изменения"
112
 
113
+ #: collapse-o-matic.php:410
114
  msgid "About"
115
+ msgstr "О плагине"
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
116
 
117
+ #: collapse-o-matic.php:413
118
+ msgid "Remove clutter, save space. Display and hide additional content in a SEO friendly way. Wrap any content&mdash;including other shortcodes&mdash;into a lovely jQuery expanding and collapsing element."
119
+ msgstr "Удалить беспорядок, сэкономить место. Показать и скрыть дополнительный контент дружественным SEO способом. Оберните любой контент, включая другие шорткоды в прекрасный развертывающийся и свертывающийся элемент на JQuery."
 
 
 
 
 
 
 
 
120
 
121
+ #: collapse-o-matic.php:415
122
+ msgid "%sDetailed documentation%s, complete with working demonstrations of all shortcode attributes, is available for your instructional enjoyment."
123
+ msgstr "%sПолная документация%s в комплекте с рабочими демонстрациями всех атрибутов шорткода, доступна для Вашего удовольствия."
 
 
 
 
 
 
 
light_style.css CHANGED
@@ -33,7 +33,14 @@
33
  text-decoration: underline;
34
  }
35
  .maptastic {
36
- position: absolute !important;
37
  left: -10000px !important;
38
  display:block !important;
 
 
 
 
 
 
 
39
  }
33
  text-decoration: underline;
34
  }
35
  .maptastic {
36
+ position: absolute !important;
37
  left: -10000px !important;
38
  display:block !important;
39
+ }
40
+ .span_fix {
41
+ padding: 0 !important;
42
+ margin: 0 !important;
43
+ }
44
+ .span_fix:before, .span_fix:after {
45
+ content: none;
46
  }
readme.txt CHANGED
@@ -4,8 +4,8 @@ Contributors: twinpictures, baden03
4
  Donate link: http://plugins.twinpictures.de/plugins/collapse-o-matic/
5
  Tags: collapse, expand, collapsible, expandable, expandable content, collapsable content, shortcode, hidden, hide, display, accordion, accordion, jQuery, javascript, roll-your-own, twinpictures, read me, read more, more, plugin oven
6
  Requires at least: 3.5
7
- Tested up to: 3.9.1
8
- Stable tag: 1.5.9
9
  License: GPLv2 or later
10
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
11
 
@@ -49,6 +49,11 @@ No. Not even close.
49
  3. Options Page? Yes, Options Page!
50
 
51
  == Changelog ==
 
 
 
 
 
52
 
53
  = 1.5.9 =
54
  * fixed issue with missing classes in dark style
@@ -241,6 +246,12 @@ Fixed auto-expand of urls with id-anchors
241
 
242
  == Upgrade Notice ==
243
 
 
 
 
 
 
 
244
  = 1.5.9 =
245
  * fixed issue with missing classes in dark style
246
  * streamlined the collapse/expand function
4
  Donate link: http://plugins.twinpictures.de/plugins/collapse-o-matic/
5
  Tags: collapse, expand, collapsible, expandable, expandable content, collapsable content, shortcode, hidden, hide, display, accordion, accordion, jQuery, javascript, roll-your-own, twinpictures, read me, read more, more, plugin oven
6
  Requires at least: 3.5
7
+ Tested up to: 4.0
8
+ Stable tag: 1.5.10
9
  License: GPLv2 or later
10
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
11
 
49
  3. Options Page? Yes, Options Page!
50
 
51
  == Changelog ==
52
+ = 1.5.10 =
53
+ * change the find me element from an anchor to an input due to HTML5 no longer supporting the Name attribute
54
+ * fixed bug with trigpos inline
55
+ * added span_fix classes to css files
56
+ * added 4.0 icons to assets
57
 
58
  = 1.5.9 =
59
  * fixed issue with missing classes in dark style
246
 
247
  == Upgrade Notice ==
248
 
249
+ = 1.5.10 =
250
+ * fixed an HTML5 validation issue with anchors having name attributes
251
+ * fixed bug with trigpos inline
252
+ * added span_fix classes to css files
253
+ * added 4.0 icons to assets
254
+
255
  = 1.5.9 =
256
  * fixed issue with missing classes in dark style
257
  * streamlined the collapse/expand function