Changeset 1138989

Timestamp:

04/20/2015 10:06:05 AM (11 years ago)

Author:

karim79

Message:

Bundling of JS, Dev mode flag

Location:

kraken-image-optimizer/trunk

Files:

• css/jquery.modal.css (modified) (2 diffs)
• js/ajax.js (modified) (3 diffs)
• js/dist (added)
• js/dist/kraken.min.js (added)
• js/jquery.modal.min.js (modified) (1 diff)
• kraken.php (modified) (4 diffs)
• lib/Kraken.php (modified) (1 diff)
• readme.txt (modified) (2 diffs)

kraken-image-optimizer/trunk/css/jquery.modal.css

@@ -1 @@
-.modal {
+.kraken-modal {
   display: none;
   width: 600px;
@@ -15 +15 @@
   box-shadow: 0 0 10px #000;
 }
-
-/*
-.modal a.close-modal {
-  position: absolute;
-  top: -12.5px;
-  right: -12.5px;
-  display: block;
-  width: 30px;
-  height: 30px;
-  text-indent: -9999px;
-  background: url(close.png) no-repeat 0 0;
-}
-*/
-
-.modal-spinner {
+.kraken-modal-spinner {
   display: none;
   width: 64px;

kraken-image-optimizer/trunk/js/ajax.js

@@ -156 +156 @@
             .append('<br /><small class="kraken-bulk-small">The following <strong>' + nImages + '</strong> images will be optimized by Kraken.io using the <strong class="bulkSetting">' + setting + '</strong> setting:</small><br />')
             .appendTo("body")
-            .modal(modalOptions)
-            .bind($.modal.BEFORE_CLOSE, function(event, modal) {
-
-            })
-            .bind($.modal.OPEN, function(event, modal) {
-
-            })
-            .bind($.modal.CLOSE, function(event, modal) {
+            .kmodal(modalOptions)
+            .bind($.kmodal.BEFORE_CLOSE, function(event, modal) {
+
+            })
+            .bind($.kmodal.OPEN, function(event, modal) {
+
+            })
+            .bind($.kmodal.CLOSE, function(event, modal) {
                 $("#kraken-bulk-modal").remove();
             })
@@ -207 +207 @@
 
         $(".close-kraken-bulk").click(function() {
-            $.modal.close();
+            $.kmodal.close();
         });
 
@@ -309 +309 @@
                 .unbind("click")
                 .click(function() {
-                    $.modal.close();
+                    $.kmodal.close();
                 });
         }

kraken-image-optimizer/trunk/js/jquery.modal.min.js

@@ -3 +3 @@
     Version 0.5.5
 */
-!function(a){var b=null;a.modal=function(c,d){a.modal.close();var e,f;if(this.$body=a("body"),this.options=a.extend({},a.modal.defaults,d),this.options.doFade=!isNaN(parseInt(this.options.fadeDuration,10)),c.is("a"))if(f=c.attr("href"),/^#/.test(f)){if(this.$elm=a(f),1!==this.$elm.length)return null;this.open()}else this.$elm=a("<div>"),this.$body.append(this.$elm),e=function(a,b){b.elm.remove()},this.showSpinner(),c.trigger(a.modal.AJAX_SEND),a.get(f).done(function(d){b&&(c.trigger(a.modal.AJAX_SUCCESS),b.$elm.empty().append(d).on(a.modal.CLOSE,e),b.hideSpinner(),b.open(),c.trigger(a.modal.AJAX_COMPLETE))}).fail(function(){c.trigger(a.modal.AJAX_FAIL),b.hideSpinner(),c.trigger(a.modal.AJAX_COMPLETE)});else this.$elm=c,this.open()},a.modal.prototype={constructor:a.modal,open:function(){var b=this;this.options.doFade?(this.block(),setTimeout(function(){b.show()},this.options.fadeDuration*this.options.fadeDelay)):(this.block(),this.show()),this.options.escapeClose&&a(document).on("keydown.modal",function(b){27==b.which&&a.modal.close()}),this.options.clickClose&&this.blocker.click(a.modal.close)},close:function(){this.unblock(),this.hide(),a(document).off("keydown.modal")},block:function(){var b=this.options.doFade?0:this.options.opacity;this.$elm.trigger(a.modal.BEFORE_BLOCK,[this._ctx()]),this.blocker=a('<div class="jquery-modal blocker"></div>').css({top:0,right:0,bottom:0,left:0,width:"100%",height:"100%",position:"fixed",zIndex:this.options.zIndex,background:this.options.overlay,opacity:b}),this.$body.append(this.blocker),this.options.doFade&&this.blocker.animate({opacity:this.options.opacity},this.options.fadeDuration),this.$elm.trigger(a.modal.BLOCK,[this._ctx()])},unblock:function(){this.options.doFade?this.blocker.fadeOut(this.options.fadeDuration,function(){a(this).remove()}):this.blocker.remove()},show:function(){this.$elm.trigger(a.modal.BEFORE_OPEN,[this._ctx()]),this.options.showClose&&(this.closeButton=a('<a href="#close-modal" rel="modal:close" class="close-modal '+this.options.closeClass+'">'+this.options.closeText+"</a>"),this.$elm.append(this.closeButton)),this.$elm.addClass(this.options.modalClass+" current"),this.center(),this.options.doFade?this.$elm.fadeIn(this.options.fadeDuration):this.$elm.show(),this.$elm.trigger(a.modal.OPEN,[this._ctx()])},hide:function(){this.$elm.trigger(a.modal.BEFORE_CLOSE,[this._ctx()]),this.closeButton&&this.closeButton.remove(),this.$elm.removeClass("current"),this.options.doFade?this.$elm.fadeOut(this.options.fadeDuration):this.$elm.hide(),this.$elm.trigger(a.modal.CLOSE,[this._ctx()])},showSpinner:function(){this.options.showSpinner&&(this.spinner=this.spinner||a('<div class="'+this.options.modalClass+'-spinner"></div>').append(this.options.spinnerHtml),this.$body.append(this.spinner),this.spinner.show())},hideSpinner:function(){this.spinner&&this.spinner.remove()},center:function(){this.$elm.css({position:"fixed",top:"50%",left:"50%",marginTop:-(this.$elm.outerHeight()/2),marginLeft:-(this.$elm.outerWidth()/2),zIndex:this.options.zIndex+1})},_ctx:function(){return{elm:this.$elm,blocker:this.blocker,options:this.options}}},a.modal.prototype.resize=a.modal.prototype.center,a.modal.close=function(a){if(b){a&&a.preventDefault(),b.close();var c=b.$elm;return b=null,c}},a.modal.resize=function(){b&&b.resize()},a.modal.isActive=function(){return b?!0:!1},a.modal.defaults={overlay:"#000",opacity:.75,zIndex:1,escapeClose:!0,clickClose:!0,closeText:"Close",closeClass:"",modalClass:"modal",spinnerHtml:null,showSpinner:!0,showClose:!0,fadeDuration:null,fadeDelay:1},a.modal.BEFORE_BLOCK="modal:before-block",a.modal.BLOCK="modal:block",a.modal.BEFORE_OPEN="modal:before-open",a.modal.OPEN="modal:open",a.modal.BEFORE_CLOSE="modal:before-close",a.modal.CLOSE="modal:close",a.modal.AJAX_SEND="modal:ajax:send",a.modal.AJAX_SUCCESS="modal:ajax:success",a.modal.AJAX_FAIL="modal:ajax:fail",a.modal.AJAX_COMPLETE="modal:ajax:complete",a.fn.modal=function(c){return 1===this.length&&(b=new a.modal(this,c)),this},a(document).on("click.modal",'a[rel="modal:close"]',a.modal.close),a(document).on("click.modal",'a[rel="modal:open"]',function(b){b.preventDefault(),a(this).modal()})}(jQuery);
+(function($) {
+
+  var current = null;
+
+  $.kmodal = function(el, options) {
+    $.kmodal.close(); // Close any open modals.
+    var remove, target;
+    this.$body = $('body');
+    this.options = $.extend({}, $.kmodal.defaults, options);
+    this.options.doFade = !isNaN(parseInt(this.options.fadeDuration, 10));
+    if (el.is('a')) {
+      target = el.attr('href');
+      //Select element by id from href
+      if (/^#/.test(target)) {
+        this.$elm = $(target);
+        if (this.$elm.length !== 1) return null;
+        this.open();
+      //AJAX
+      } else {
+        this.$elm = $('<div>');
+        this.$body.append(this.$elm);
+        remove = function(event, modal) { modal.elm.remove(); };
+        this.showSpinner();
+        el.trigger($.kmodal.AJAX_SEND);
+        $.get(target).done(function(html) {
+          if (!current) return;
+          el.trigger($.kmodal.AJAX_SUCCESS);
+          current.$elm.empty().append(html).on($.kmodal.CLOSE, remove);
+          current.hideSpinner();
+          current.open();
+          el.trigger($.kmodal.AJAX_COMPLETE);
+        }).fail(function() {
+          el.trigger($.kmodal.AJAX_FAIL);
+          current.hideSpinner();
+          el.trigger($.kmodal.AJAX_COMPLETE);
+        });
+      }
+    } else {
+      this.$elm = el;
+      this.$body.append(this.$elm);
+      this.open();
+    }
+  };
+
+  $.kmodal.prototype = {
+    constructor: $.kmodal,
+
+    open: function() {
+      var m = this;
+      if(this.options.doFade) {
+        this.block();
+        setTimeout(function() {
+          m.show();
+        }, this.options.fadeDuration * this.options.fadeDelay);
+      } else {
+        this.block();
+        this.show();
+      }
+      if (this.options.escapeClose) {
+        $(document).on('keydown.modal', function(event) {
+          if (event.which == 27) $.kmodal.close();
+        });
+      }
+      if (this.options.clickClose) this.blocker.click($.kmodal.close);
+    },
+
+    close: function() {
+      this.unblock();
+      this.hide();
+      $(document).off('keydown.modal');
+    },
+
+    block: function() {
+      var initialOpacity = this.options.doFade ? 0 : this.options.opacity;
+      this.$elm.trigger($.kmodal.BEFORE_BLOCK, [this._ctx()]);
+      this.blocker = $('<div class="jquery-modal blocker"></div>').css({
+        top: 0, right: 0, bottom: 0, left: 0,
+        width: "100%", height: "100%",
+        position: "fixed",
+        zIndex: this.options.zIndex,
+        background: this.options.overlay,
+        opacity: initialOpacity
+      });
+      this.$body.append(this.blocker);
+      if(this.options.doFade) {
+        this.blocker.animate({opacity: this.options.opacity}, this.options.fadeDuration);
+      }
+      this.$elm.trigger($.kmodal.BLOCK, [this._ctx()]);
+    },
+
+    unblock: function() {
+      if(this.options.doFade) {
+        this.blocker.fadeOut(this.options.fadeDuration, function() {
+          $(this).remove();
+        });
+      } else {
+        this.blocker.remove();
+      }
+    },
+
+    show: function() {
+      this.$elm.trigger($.kmodal.BEFORE_OPEN, [this._ctx()]);
+      if (this.options.showClose) {
+        this.closeButton = $('<a href="#close-modal" rel="modal:close" class="close-modal ' + this.options.closeClass + '">' + this.options.closeText + '</a>');
+        this.$elm.append(this.closeButton);
+      }
+      this.$elm.addClass(this.options.modalClass + ' current');
+      this.center();
+      if(this.options.doFade) {
+        this.$elm.fadeIn(this.options.fadeDuration);
+      } else {
+        this.$elm.show();
+      }
+      this.$elm.trigger($.kmodal.OPEN, [this._ctx()]);
+    },
+
+    hide: function() {
+      this.$elm.trigger($.kmodal.BEFORE_CLOSE, [this._ctx()]);
+      if (this.closeButton) this.closeButton.remove();
+      this.$elm.removeClass('current');
+
+      if(this.options.doFade) {
+        this.$elm.fadeOut(this.options.fadeDuration);
+      } else {
+        this.$elm.hide();
+      }
+      this.$elm.trigger($.kmodal.CLOSE, [this._ctx()]);
+    },
+
+    showSpinner: function() {
+      if (!this.options.showSpinner) return;
+      this.spinner = this.spinner || $('<div class="' + this.options.modalClass + '-spinner"></div>')
+        .append(this.options.spinnerHtml);
+      this.$body.append(this.spinner);
+      this.spinner.show();
+    },
+
+    hideSpinner: function() {
+      if (this.spinner) this.spinner.remove();
+    },
+
+    center: function() {
+      this.$elm.css({
+        position: 'fixed',
+        top: "50%",
+        left: "50%",
+        marginTop: - (this.$elm.outerHeight() / 2),
+        marginLeft: - (this.$elm.outerWidth() / 2),
+        zIndex: this.options.zIndex + 1
+      });
+    },
+
+    //Return context for custom events
+    _ctx: function() {
+      return { elm: this.$elm, blocker: this.blocker, options: this.options };
+    }
+  };
+
+  //resize is alias for center for now
+  $.kmodal.prototype.resize = $.kmodal.prototype.center;
+
+  $.kmodal.close = function(event) {
+    if (!current) return;
+    if (event) event.preventDefault();
+    current.close();
+    var that = current.$elm;
+    current = null;
+    return that;
+  };
+
+  $.kmodal.resize = function() {
+    if (!current) return;
+    current.resize();
+  };
+
+  // Returns if there currently is an active modal
+  $.kmodal.isActive = function () {
+    return current ? true : false;
+  }
+
+  $.kmodal.defaults = {
+    overlay: "#000",
+    opacity: 0.75,
+    zIndex: 1,
+    escapeClose: true,
+    clickClose: true,
+    closeText: 'Close',
+    closeClass: '',
+    modalClass: "kraken-modal",
+    spinnerHtml: null,
+    showSpinner: true,
+    showClose: true,
+    fadeDuration: null,   // Number of milliseconds the fade animation takes.
+    fadeDelay: 1.0        // Point during the overlay's fade-in that the modal begins to fade in (.5 = 50%, 1.5 = 150%, etc.)
+  };
+
+  // Event constants
+  $.kmodal.BEFORE_BLOCK = 'modal:before-block';
+  $.kmodal.BLOCK = 'modal:block';
+  $.kmodal.BEFORE_OPEN = 'modal:before-open';
+  $.kmodal.OPEN = 'modal:open';
+  $.kmodal.BEFORE_CLOSE = 'modal:before-close';
+  $.kmodal.CLOSE = 'modal:close';
+  $.kmodal.AJAX_SEND = 'modal:ajax:send';
+  $.kmodal.AJAX_SUCCESS = 'modal:ajax:success';
+  $.kmodal.AJAX_FAIL = 'modal:ajax:fail';
+  $.kmodal.AJAX_COMPLETE = 'modal:ajax:complete';
+
+  $.fn.kmodal = function(options){
+    if (this.length === 1) {
+      current = new $.kmodal(this, options);
+    }
+    return this;
+  };
+
+  // Automatically bind links with rel="modal:close" to, well, close the modal.
+  $(document).on('click.modal', 'a[rel="modal:close"]', $.kmodal.close);
+  $(document).on('click.modal', 'a[rel="modal:open"]', function(event) {
+    event.preventDefault();
+    $(this).kmodal();
+  });
+})(jQuery);

kraken-image-optimizer/trunk/kraken.php

@@ -22 +22 @@
  * Description: This plugin allows you to optimize your WordPress images through the Kraken API, the world's most advanced image optimization solution.
  * Author: Karim Salman
- * Version: 1.0.8
- * Stable Tag: 1.0.8
+ * Version: 1.0.9
+ * Stable Tag: 1.0.9
  * Author URI: https://kraken.io
  * License GPL2
@@ -31 +31 @@
 if ( !class_exists( 'Wp_Kraken' ) ) {
 
+    define( 'KRAKEN_DEV_MODE', false );
     class Wp_Kraken {
 
@@ -41 +42 @@
         private $optimization_type = 'lossy';
 
-        public static $kraken_plugin_version = '1.0.8';
+        public static $kraken_plugin_version = '1.0.9';
 
         function __construct() {
@@ -135 +136 @@
             if ( $hook == 'options-media.php' || $hook == 'upload.php') {
                 wp_enqueue_script( 'jquery' );
-                wp_enqueue_script( 'tipsy-js', plugins_url( '/js/jquery.tipsy.js', __FILE__ ), array( 'jquery' ) );
-                wp_enqueue_script( 'async-js', plugins_url( '/js/async.js', __FILE__ ) );
-                wp_enqueue_script( 'ajax-script', plugins_url( '/js/ajax.js', __FILE__ ), array( 'jquery' ) );
+                if ( KRAKEN_DEV_MODE === true ) {
+                    wp_enqueue_script( 'async-js', plugins_url( '/js/async.js', __FILE__ ) );
+                    wp_enqueue_script( 'tipsy-js', plugins_url( '/js/jquery.tipsy.js', __FILE__ ), array( 'jquery' ) );
+                    wp_enqueue_script( 'modal-js', plugins_url( '/js/jquery.modal.min.js', __FILE__ ), array( 'jquery' ) );
+                    wp_enqueue_script( 'ajax-script', plugins_url( '/js/ajax.js', __FILE__ ), array( 'jquery' ) );
+                    wp_localize_script( 'ajax-script', 'ajax_object', array( 'ajax_url' => admin_url( 'admin-ajax.php' ) ) );
+                    wp_localize_script( 'ajax-script', 'kraken_settings', $this->kraken_settings );
+                } else {
+                    wp_enqueue_script( 'kraken-js', plugins_url( '/js/dist/kraken.min.js', __FILE__ ), array( 'jquery' ) );
+                    wp_localize_script( 'kraken-js', 'ajax_object', array( 'ajax_url' => admin_url( 'admin-ajax.php' ) ) );
+                    wp_localize_script( 'kraken-js', 'kraken_settings', $this->kraken_settings );                                       
+                }
                 wp_enqueue_style( 'kraken_admin_style', plugins_url( 'css/admin.css', __FILE__ ) );
                 wp_enqueue_style( 'tipsy-style', plugins_url( 'css/tipsy.css', __FILE__ ) );
                 wp_enqueue_style( 'modal-style', plugins_url( 'css/jquery.modal.css', __FILE__ ) );
-                wp_localize_script( 'ajax-script', 'ajax_object', array( 'ajax_url' => admin_url( 'admin-ajax.php' ) ) );
-                wp_localize_script( 'ajax-script', 'kraken_settings', $this->kraken_settings );
-                wp_enqueue_script( 'modal-js', plugins_url( '/js/jquery.modal.min.js', __FILE__ ), array( 'jquery' ) );             
             }
         }

kraken-image-optimizer/trunk/lib/Kraken.php

@@ -5 +5 @@
 
     protected $auth = array();
-    public static $kraken_plugin_version = '1.0.8';
+    public static $kraken_plugin_version = '1.0.9';
 
     public function __construct($key = '', $secret = '')

kraken-image-optimizer/trunk/readme.txt

@@ -5 +5 @@
 Tested up to: 4.1
 Donate link: https://kraken.io
-Stable tag: 1.0.8
+Stable tag: 1.0.9
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
@@ -95 +95 @@
 == Changelog ==
 
+= 1.0.9 =
+* Fixed potential conflict with Bootstrap Modal on blogs using Twitter Bootstrap.
+* Better bundling of scripts for faster loading of the plugin.
+
 = 1.0.8 =
 * Added the ability to control the number of images the bulk tool optimizes at once. The default settings of 4 is recommended. Blogs with limited resources, for example those on small shared hosting plans should try a lower value if they run into issues with bulk optimization. Blogs on larger hosting plans can experiment with higher values.