[Pkg-owncloud-commits] [SCM] owncloud.git branch, master, updated. debian/4.0.8debian-1.6-68-g5e4d108

[David Prévot]

The following commit has been merged in the master branch:
commit 0f552d6a3c8b8e3386d9a17622d68ef070074deb
Author: David Prévot <taffit at debian.org>
Date:   Mon Apr 1 15:43:07 2013 -0400

    Revert "Add missing jquery.onfontresize source"
    
    This reverts commit 243d422e724474a432bd4fad40b48412516065c8.
    
    Conflicts:
    	debian/changelog
    	debian/patches/04_add_onfontresize.diff

diff --git a/debian/changelog b/debian/changelog
index 21ad22c..b93d272 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,7 +26,6 @@ owncloud (5.0.0+dfsg-1) UNRELEASED; urgency=low
   * debian/patches/:
     - Refresh existing patches
     - Drop unneeded patches
-    - 04_add_onfontresize.diff: Add missing jquery.onfontresize source
     - fix_mediawiki.diff: Adapt path to mediawi’s classes
     - fix_upgrade.php: Fix upgrade issue from 4.0.8
   * debian/owncloud.links:
diff --git a/debian/patches/04_add_onfontresize.diff b/debian/patches/04_add_onfontresize.diff
deleted file mode 100644
index ed93113..0000000
--- a/debian/patches/04_add_onfontresize.diff
+++ /dev/null
@@ -1,59 +0,0 @@
-Description: Add missing jquery.onfontresize source
-Author: Tom Deater (http://www.tomdeater.com)
-Origin: other, http://www.tomdeater.com/jquery/onfontresize/jquery.onfontresize.js
-Bug: https://github.com/owncloud/apps/issues/845
-Applied-Upstream: https://github.com/owncloud/apps/commit/b2a6ba274e1c0ce5c1f1a8b477dfd38396d43d4d
-Reviewed-by: David Prévot <taffit at debian.org>
-Last-Update: 2013-03-21
---- /dev/null
-+++ b/apps/contacts/js/jquery.onfontresize.js
-@@ -0,0 +1,48 @@
-+/**
-+ *
-+ * Copyright (c) 2008 Tom Deater (http://www.tomdeater.com)
-+ * Licensed under the MIT License:
-+ * http://www.opensource.org/licenses/mit-license.php
-+ *
-+ * uses an iframe, sized in ems, to detect font size changes then trigger a "fontresize" event
-+ * heavily based on code by Hedger Wang: http://www.hedgerwow.com/360/dhtml/js-onfontresize.html
-+ *
-+ * "fontresize" event is triggered on the document object
-+ * subscribe to event using: $(document).bind("fontresize", function (event, data) {});
-+ * "data" contains the current size of 1 em unit (in pixels)
-+ * 
-+ */
-+ 
-+jQuery.onFontResize = (function ($) {
-+	// initialize
-+	$(document).ready(function () {
-+		var $resizeframe = $("<iframe />")
-+			.attr("id", "frame-onFontResize" + Date.parse(new Date))
-+			.addClass("div-onfontresize")
-+			.css({width: "100em", height: "10px", position: "absolute", borderWidth: 0, top: "-5000px", left: "-5000px"})
-+			.appendTo("body");
-+			
-+		if ($.browser.msie) {
-+			// use IE's native iframe resize event
-+			$resizeframe.bind("resize", function () {
-+				$.onFontResize.trigger($resizeframe[0].offsetWidth / 100);
-+			});
-+		} else {
-+			// everyone else uses script inside the iframe to detect resize
-+			var doc = $resizeframe[0].contentWindow || $resizeframe[0].contentDocument || $resizeframe[0].document;
-+			doc = doc.document || doc; 
-+			doc.open();
-+			doc.write('<scri' + 'pt>window.onload = function(){var em = parent.jQuery(".div-onfontresize")[0];window.onresize = function(){if(parent.jQuery.onFontResize){parent.jQuery.onFontResize.trigger(em.offsetWidth / 100);}}};</scri' + 'pt>');
-+			doc.close();
-+		}
-+		
-+		jQuery.onFontResize.initialSize = $resizeframe[0].offsetWidth / 100;
-+	});
-+	
-+	return {
-+		// public method, so it can be called from within the iframe
-+		trigger: function (em) {
-+			$(document).trigger("fontresize", [em]);
-+		}
-+	};
-+}) (jQuery);
-\ No newline at end of file
diff --git a/debian/patches/series b/debian/patches/series
index 19036fa..1a9fcb4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
 01_fix_data_path.diff
 03_fix_phpmailer.diff
-04_add_onfontresize.diff
 05_no_app_store.diff
 fix_tar_require.diff
 fix_mediawiki.diff

-- 
owncloud.git