remove $.extend; fix for ie9

3rdparty/PDF.js/compatibility.js

@@ -15,7 +15,10 @@
  * limitations under the License.
  */
 
-/** @license Copyright 2012 Mozilla Foundation * Apachine License Version 2.0 */
+/** @license Copyright 2012 Mozilla Foundation 
+ * Copyright 2013 Lu Wang <coolwanglu@gmail.com>
+ * Apachine License Version 2.0 
+ */
 
 'use strict';
 
@@ -55,8 +58,8 @@
 
   Object.defineProperty(HTMLElement.prototype, 'classList', {
     get: function() {
-      if (this._classList)
+      if (this['_classList'])
-        return this._classList;
+        return this['_classList'];
 
       var classList = Object.create(classListPrototype, {
         element: {

3rdparty/PDF.js/compatibility.min.js

@@ -1,4 +1,7 @@
 /*
- Copyright 2012 Mozilla Foundation * Apachine License Version 2.0 */
+ Copyright 2012 Mozilla Foundation 
-(function(){function b(a,b,e,f){var c=(a.className||"").split(/\s+/g);""===c[0]&&c.shift();var d=c.indexOf(b);0>d&&e&&c.push(b);0<=d&&f&&c.splice(d,1);a.className=c.join(" ");return 0<=d}if(!("classList"in document.createElement("div"))){var e={add:function(a){b(this.element,a,!0,!1)},contains:function(a){return b(this.element,a,!1,!1)},remove:function(a){b(this.element,a,!1,!0)},toggle:function(a){b(this.element,a,!0,!0)}};Object.defineProperty(HTMLElement.prototype,"classList",{get:function(){if(this.a)return this.a;
+ Copyright 2013 Lu Wang <coolwanglu@gmail.com>
+ Apachine License Version 2.0 
+*/
+(function(){function b(a,b,e,f){var c=(a.className||"").split(/\s+/g);""===c[0]&&c.shift();var d=c.indexOf(b);0>d&&e&&c.push(b);0<=d&&f&&c.splice(d,1);a.className=c.join(" ");return 0<=d}if(!("classList"in document.createElement("div"))){var e={add:function(a){b(this.element,a,!0,!1)},contains:function(a){return b(this.element,a,!1,!1)},remove:function(a){b(this.element,a,!1,!0)},toggle:function(a){b(this.element,a,!0,!0)}};Object.defineProperty(HTMLElement.prototype,"classList",{get:function(){if(this._classList)return this._classList;
 var a=Object.create(e,{element:{value:this,writable:!1,enumerable:!0}});Object.defineProperty(this,"_classList",{value:a,writable:!1,enumerable:!1});return a},enumerable:!0})}})();

share/pdf2htmlEX.js.in

@@ -98,6 +98,9 @@
     return parseInt(ele.getAttribute('data-page-no'), 16);
   };
 
+  /**
+   * @param{NodeList} eles
+   */
   function disable_dragstart(eles) {
     for(var i = 0, l = eles.length; i < l; ++i) {
       eles[i].addEventListener('dragstart', function() {
@@ -106,10 +109,25 @@
     }
   };
 
+  /**
+   * @param{...Object} var_args
+   */
+  function clone_and_extend_objs(var_args) {
+    var result_obj = {};
+    for(var i = 0, l = arguments.length; i < l; ++i) {
+      var cur_obj = arguments[i];
+      for(var k in cur_obj) {
+        if(cur_obj.hasOwnProperty(k)) {
+          result_obj[k] = cur_obj[k];
+        }
+      }
+    }
+    return result_obj;
+  };
+
   /** 
    * @constructor 
    * @param{Element} page The element for the page
-   * @struct
    */
   function Page(page) {
     if(!page) return;
@@ -147,7 +165,7 @@
       this.loaded = true;
     }
   };
-  $.extend(Page.prototype, /** @lends {Page.prototype} */ {
+  Page.prototype = {
     /* hide & show are for contents, the page frame is still there */
     hide : function(){
       if(this.loaded) {
@@ -214,7 +232,7 @@
     width : function () {
       return this.p.clientWidth;
     }
-  });
+  };
 
   /** 
    * export pdf2htmlEX.Viewer
@@ -224,7 +242,7 @@
     /* do nothing if jQuery is not ready */
     if(!jQuery) return;
 
-    this.config = $.extend({}, DEFAULT_CONFIG, config);
+    this.config = clone_and_extend_objs(DEFAULT_CONFIG, config);
     this.pages_loading = [];
     this.init_before_loading_content();
 
@@ -234,7 +252,7 @@
     }, false);
   };
 
-  $.extend(Viewer.prototype, /** @lends {Viewer.prototype} */ {
+  Viewer.prototype = {
     scale : 1,
 
     init_before_loading_content : function() {
@@ -313,7 +331,14 @@
       this.page_map = new_page_map;
     },
 
-    load_page : function(idx, pages_to_preload, successCallback, errorCallback) {
+    /**
+     * @param{number} idx
+     * @param{number=} pages_to_preload
+     * @param{function(Page)=} callback
+     *
+     * TODO: remove callback
+     */
+    load_page : function(idx, pages_to_preload, callback) {
       var pages = this.pages;
       if (idx >= pages.length)
         return;  // Page does not exist
@@ -375,11 +400,11 @@
 
           // Reset loading token
           delete _.pages_loading[idx];
-          if (successCallback) successCallback(_.pages[_idx]);
+
+          if(callback){ callback(p); }
         }).fail(function(jqXHR, textStatus, errorThrown){
           // Reset loading token
           delete _.pages_loading[_idx];
-          if (errorCallback) errorCallback();
         });
       }
       // Concurrent prefetch of the next pages
@@ -530,8 +555,15 @@
     get_next_page : function() { return undefined; },
     get_prev_page : function() { return undefined; },
 
-    // TODO: offsetX/Y is by default the center of container
+    /**
-    // TODO consider scale on offsetX/Y
+     * @param{number} ratio
+     * @param{boolean} is_relative
+     * @param{number=} offsetX
+     * @param{number=} offsetY
+     *
+     * TODO: offsetX/Y is by default the center of container
+     * TODO consider scale on offsetX/Y
+     */
     rescale : function (ratio, is_relative, offsetX, offsetY) {
       if (! offsetX)
         offsetX = 0;
@@ -711,7 +743,10 @@
       }
     }, 
 
-    /* pos=[x,y], where (0,0) is the top-left corner */
+    /**
+     * @param{number} page_idx
+     * @param{Array=} pos [x,y], where (0,0) is the top-left corner
+     */
     scroll_to : function(page_idx, pos) {
       var target_page = this.pages[page_idx];
       if(target_page === undefined) return;
@@ -727,7 +762,7 @@
     },
 
     __last_member__ : 'no comma' /*,*/
-  });
+  };
 
   pdf2htmlEX['Viewer'] = Viewer;
 })((window['pdf2htmlEX'] = window['pdf2htmlEX'] || {}), document);