| @@ -142,9 +142,8 @@ | ||
| 142 | 142 | $css["mb-item a"]["normal"]["cursor"] = "pointer"; // by default social share = call to action. |
| 143 | 143 | $css['mb-item a']['normal']['text-decoration'] = 'none'; |
| 144 | 144 | |
| 145 | 145 | |
| 146 | - | |
| 147 | 146 | if (isset($blockdata['button_spacing']) && $blockdata['button_spacing'] > 0) |
| 148 | 147 | { |
| 149 | 148 | $orientation = $this->collection->orientation; |
| 150 | 149 | $is_static = $w->ask('display/env/is_static'); |
| @@ -160,19 +159,8 @@ | ||
| 160 | 159 | $css['mb-item']['normal']['margin-bottom'] = $button_spacing . 'px'; |
| 161 | 160 | } |
| 162 | 161 | } |
| 163 | 162 | |
| 164 | - // Check font again. | |
| 165 | - if (Install::isPro()) | |
| 166 | - { | |
| 167 | - //var_dump($css); | |
| 168 | - $blockdata = $this->data[$this->blockname]; | |
| 169 | - $font = $blockdata['font']; | |
| 170 | - $args = array('font' => $font); | |
| 171 | - $webfont = patches::checkWebFonts($args); | |
| 172 | - $this->data[$this->blockname]['webfonts'] = $webfont; | |
| 173 | - } | |
| 174 | - | |
| 175 | 163 | return $css; |
| 176 | 164 | |
| 177 | 165 | } |
| 178 | 166 | |
| @@ -193,22 +181,23 @@ | ||
| 193 | 181 | $data[$this->blockname]["ignore_container"] = 0; |
| 194 | 182 | if (! isset($post['use_background']) && ! is_null($post)) |
| 195 | 183 | $data[$this->blockname]['use_background'] = 0; |
| 196 | 184 | |
| 185 | + | |
| 197 | 186 | if ( count ($post) == 0) |
| 198 | 187 | return $data; // don't run on default situations |
| 199 | 188 | |
| 200 | 189 | // Do the font here |
| 201 | - $blockdata = $data[$this->blockname]; | |
| 190 | + $blockdata = $this->data[$this->blockname]; | |
| 202 | 191 | $font = $blockdata['font']; |
| 203 | 192 | //$label_weight = $blockdata['font_label_weight']; |
| 204 | 193 | // $icon_weight = $blockdata['icon_label_weight']; |
| 205 | 194 | |
| 206 | 195 | $args = array('font' => $font); |
| 207 | - | |
| 208 | 196 | $webfont = patches::checkWebFonts($args); |
| 209 | 197 | $data[$this->blockname]['webfonts'] = $webfont; |
| 210 | 198 | |
| 199 | + | |
| 211 | 200 | return $data; |
| 212 | 201 | |
| 213 | 202 | } |
| 214 | 203 | |
| @@ -223,9 +212,9 @@ | ||
| 223 | 212 | <span class='content'> |
| 224 | 213 | <p><?php printf(__("Select from %s fonts you would like to use and they will show up in the dropdown list", 'maxbuttons-pro'), '<span class="fontcount"></span>'); ?></p> |
| 225 | 214 | <div class="loading_overlay"></div> |
| 226 | 215 | <div class='loading'> |
| 227 | - <img src="<?php echo MB()->get_plugin_url(false) ?>images/spinner.gif"> | |
| 216 | + <img src="<?php echo MB()->get_plugin_url(true) ?>images/loading.gif"> | |
| 228 | 217 | <span><?php _e("Loading","maxbuttons-pro"); ?></span> |
| 229 | 218 | </div> |
| 230 | 219 | <div class="font_manager"> |
| 231 | 220 | <div class='font_search'> <span><?php _e("Search","maxbuttons-pro") ?></span> |
| @@ -337,9 +326,9 @@ | ||
| 337 | 326 | |
| 338 | 327 | <?php |
| 339 | 328 | // FONT SIZE |
| 340 | 329 | //global $maxbuttons_font_sizes; |
| 341 | - //$sizes = apply_filters('mb/editor/fontsizes', maxUtils::generate_font_sizes(10,50) ); | |
| 330 | + $sizes = apply_filters('mb/editor/fontsizes', maxUtils::generate_font_sizes(10,50) ); | |
| 342 | 331 | |
| 343 | 332 | // *** LABEL SIZE *** // |
| 344 | 333 | $field_size = new maxField('number'); |
| 345 | 334 | $field_size->label = __('Label Size', 'mbsocial'); |
