From 7f7a2f6a7d283b86036ceaac4d0287f370679d3e Mon Sep 17 00:00:00 2001
From: babelouest <mail@babelouest.org>
Date: Mon, 5 May 2014 15:18:48 -0400
Subject: [PATCH 1/5] use ocdialog instead of bottom-left controls

---
 js/addressbooks.js     | 593 +++++++++++++++++++++++++++++++++++++++--
 js/loader.js           |   2 +-
 templates/contacts.php |  56 ++--
 3 files changed, 611 insertions(+), 40 deletions(-)

diff --git a/js/addressbooks.js b/js/addressbooks.js
index 367db4b6..9e0f0a47 100644
--- a/js/addressbooks.js
+++ b/js/addressbooks.js
@@ -9,6 +9,11 @@ OC.Contacts = OC.Contacts || {};
 		this.storage = storage;
 		this.book = book;
 		this.$template = template;
+		this.addressBooks = new OC.Contacts.AddressBookList(
+			this.storage,
+			$('#app-settings-content'),
+			$('#addressBookTemplate')
+		);
 	};
 
 	AddressBook.prototype.render = function() {
@@ -247,7 +252,7 @@ OC.Contacts = OC.Contacts || {};
 		this.$bookTemplate = bookTemplate;
 		this.$bookList = this.$bookTemplate.find('.addressbooklist');
 		this.$bookItemTemplate = bookItemTemplate;
-		this.$importIntoSelect = this.$bookTemplate.find('#import_into');
+		this.$importIntoSelect = $('#import_into');
 		this.$importFormatSelect = this.$bookTemplate.find('#import_format');
 		this.$importProgress = this.$bookTemplate.find('#import-status-progress');
 		this.$importStatusText = this.$bookTemplate.find('#import-status-text');
@@ -328,6 +333,35 @@ OC.Contacts = OC.Contacts || {};
 				$('.import-status').hide();
 			}
 		});
+		$('#import-contacts').on('click keypress', function() {
+			var $rightContent = $('#app-content');
+			$rightContent.append('<div id="import-dialog"></div>');
+			var $dlg = $('#contactsImportTemplate').octemplate();
+			var $divDlg = $('#import-dialog');
+			$divDlg.html($dlg).ocdialog({
+				modal: true,
+				closeOnEscape: true,
+				title: t('contacts', 'Import contacts'),
+				height: '220',
+				width: 'auto',
+				buttons: [
+					{
+						text: t('contacts', 'Close'),
+						click: function() {
+							$divDlg.ocdialog().ocdialog('close');
+							$divDlg.ocdialog().ocdialog('destroy').remove();
+						}
+					}
+				],
+				close: function(/*event, ui*/) {
+					$divDlg.ocdialog().ocdialog('close');
+					$divDlg.ocdialog().ocdialog('destroy').remove();
+				},
+				open: function(/*event, ui*/) {
+					self.buildImportSelect2();
+				}
+			});
+		});
 	};
 
 	AddressBookList.prototype.count = function() {
@@ -454,23 +488,58 @@ OC.Contacts = OC.Contacts || {};
 	 * Rebuild the select to choose which address book to import into.
 	 */
 	AddressBookList.prototype.buildImportSelect = function() {
-		console.log('buildImportSelect');
+		console.log('buildImportSelect', this);
 		var self = this;
 		this.$importIntoSelect.find('option:not([value="-1"])').remove();
-		var addressBooks = this.selectByPermission(OC.PERMISSION_UPDATE);
-		$.each(addressBooks, function(idx, book) {
-			var $opt = $('<option />');
-			$opt.val(book.getId()).text(book.getDisplayName()).data('backend', book.getBackend());
-			self.$importIntoSelect.append($opt);
-			console.log('appending', $opt, 'to', self.$importIntoSelect);
-		});
-		if(!this.isFileAction) {
-			if(addressBooks.length === 1) {
-				this.$importIntoSelect.val(this.$importIntoSelect.find('option:not([value="-1"])').first().val()).hide().trigger('change');
-				self.$importFileInput.prop('disabled', false);
-			} else {
-				this.$importIntoSelect.show();
-				self.$importFileInput.prop('disabled', true);
+		var addressBooks = self.selectByPermission(OC.PERMISSION_UPDATE);
+		if (addressBooks.length > 0) {
+			console.log('ImportInto Select', self.$importIntoSelect);
+			//console.log('addressbooks', addressBooks);
+			$.each(addressBooks, function(idx, book) {
+				var $opt = $('<option />');
+				$opt.val(book.getId()).text(book.getDisplayName()).data('backend', book.getBackend());
+				self.$importIntoSelect.append($opt);
+				console.log('appending', $opt, 'to', self.$importIntoSelect);
+			});
+			if(!this.isFileAction) {
+				if(addressBooks.length === 1) {
+					//console.log("coin !");
+					this.$importIntoSelect.val(this.$importIntoSelect.find('option:not([value="-1"])').first().val()).hide().trigger('change');
+					self.$importFileInput.prop('disabled', false);
+				} else {
+					//console.log("coin !!!");
+					this.$importIntoSelect.show();
+					self.$importFileInput.prop('disabled', true);
+				}
+			}
+		}
+	};
+
+	/**
+	 * Rebuild the select to choose which address book to import into.
+	 */
+	AddressBookList.prototype.buildImportSelect2 = function() {
+		console.log('buildImportSelect2', this);
+		var self = this;
+		this.$importIntoSelect.find('option:not([value="-1"])').remove();
+		var addressBooks = self.selectByPermission(OC.PERMISSION_UPDATE);
+		if (addressBooks.length > 0) {
+			console.log('ImportInto Select', self.$importIntoSelect);
+			//console.log('addressbooks', addressBooks);
+			$.each(addressBooks, function(idx, book) {
+				var $opt = $('<option />');
+				$opt.val(book.getId()).text(book.getDisplayName()).data('backend', book.getBackend());
+				self.$importIntoSelect.append($opt);
+				console.log('appending2', $opt, 'to', self.$importIntoSelect);
+			});
+			if(!this.isFileAction) {
+				if(addressBooks.length === 1) {
+					this.$importIntoSelect.val(this.$importIntoSelect.find('option:not([value="-1"])').first().val()).hide().trigger('change');
+					self.$importFileInput.prop('disabled', false);
+				} else {
+					this.$importIntoSelect.show();
+					self.$importFileInput.prop('disabled', true);
+				}
 			}
 		}
 	};
@@ -656,3 +725,495 @@ OC.Contacts = OC.Contacts || {};
 	OC.Contacts.AddressBookList = AddressBookList;
 
 })(window, jQuery, OC);
+
+
+////////////////////////////////////////////////////////
+// Domain Public by Eric Wendelin http://eriwen.com/ (2008)
+//                  Luke Smith http://lucassmith.name/ (2008)
+//                  Loic Dachary <loic@dachary.org> (2008)
+//                  Johan Euphrosine <proppy@aminche.com> (2008)
+//                  Oyvind Sean Kinsey http://kinsey.no/blog (2010)
+//                  Victor Homyakov <victor-homyakov@users.sourceforge.net> (2010)
+/*global module, exports, define, ActiveXObject*/
+(function(global, factory) {
+    if (typeof exports === 'object') {
+        // Node
+        module.exports = factory();
+    } else if (typeof define === 'function' && define.amd) {
+        // AMD
+        define(factory);
+    } else {
+        // Browser globals
+        global.printStackTrace = factory();
+    }
+}(this, function() {
+    /**
+     * Main function giving a function stack trace with a forced or passed in Error
+     *
+     * @cfg {Error} e The error to create a stacktrace from (optional)
+     * @cfg {Boolean} guess If we should try to resolve the names of anonymous functions
+     * @return {Array} of Strings with functions, lines, files, and arguments where possible
+     */
+    function printStackTrace(options) {
+        options = options || {guess: true};
+        var ex = options.e || null, guess = !!options.guess;
+        var p = new printStackTrace.implementation(), result = p.run(ex);
+        return (guess) ? p.guessAnonymousFunctions(result) : result;
+    }
+
+    printStackTrace.implementation = function() {
+    };
+
+    printStackTrace.implementation.prototype = {
+        /**
+         * @param {Error} [ex] The error to create a stacktrace from (optional)
+         * @param {String} [mode] Forced mode (optional, mostly for unit tests)
+         */
+        run: function(ex, mode) {
+            ex = ex || this.createException();
+            mode = mode || this.mode(ex);
+            if (mode === 'other') {
+                return this.other(arguments.callee);
+            } else {
+                return this[mode](ex);
+            }
+        },
+
+        createException: function() {
+            try {
+                this.undef();
+            } catch (e) {
+                return e;
+            }
+        },
+
+        /**
+         * Mode could differ for different exception, e.g.
+         * exceptions in Chrome may or may not have arguments or stack.
+         *
+         * @return {String} mode of operation for the exception
+         */
+        mode: function(e) {
+            if (e['arguments'] && e.stack) {
+                return 'chrome';
+            }
+
+            if (e.stack && e.sourceURL) {
+                return 'safari';
+            }
+
+            if (e.stack && e.number) {
+                return 'ie';
+            }
+
+            if (e.stack && e.fileName) {
+                return 'firefox';
+            }
+
+            if (e.message && e['opera#sourceloc']) {
+                // e.message.indexOf("Backtrace:") > -1 -> opera9
+                // 'opera#sourceloc' in e -> opera9, opera10a
+                // !e.stacktrace -> opera9
+                if (!e.stacktrace) {
+                    return 'opera9'; // use e.message
+                }
+                if (e.message.indexOf('\n') > -1 && e.message.split('\n').length > e.stacktrace.split('\n').length) {
+                    // e.message may have more stack entries than e.stacktrace
+                    return 'opera9'; // use e.message
+                }
+                return 'opera10a'; // use e.stacktrace
+            }
+
+            if (e.message && e.stack && e.stacktrace) {
+                // e.stacktrace && e.stack -> opera10b
+                if (e.stacktrace.indexOf("called from line") < 0) {
+                    return 'opera10b'; // use e.stacktrace, format differs from 'opera10a'
+                }
+                // e.stacktrace && e.stack -> opera11
+                return 'opera11'; // use e.stacktrace, format differs from 'opera10a', 'opera10b'
+            }
+
+            if (e.stack && !e.fileName) {
+                // Chrome 27 does not have e.arguments as earlier versions,
+                // but still does not have e.fileName as Firefox
+                return 'chrome';
+            }
+
+            return 'other';
+        },
+
+        /**
+         * Given a context, function name, and callback function, overwrite it so that it calls
+         * printStackTrace() first with a callback and then runs the rest of the body.
+         *
+         * @param {Object} context of execution (e.g. window)
+         * @param {String} functionName to instrument
+         * @param {Function} callback function to call with a stack trace on invocation
+         */
+        instrumentFunction: function(context, functionName, callback) {
+            context = context || window;
+            var original = context[functionName];
+            context[functionName] = function instrumented() {
+                callback.call(this, printStackTrace().slice(4));
+                return context[functionName]._instrumented.apply(this, arguments);
+            };
+            context[functionName]._instrumented = original;
+        },
+
+        /**
+         * Given a context and function name of a function that has been
+         * instrumented, revert the function to it's original (non-instrumented)
+         * state.
+         *
+         * @param {Object} context of execution (e.g. window)
+         * @param {String} functionName to de-instrument
+         */
+        deinstrumentFunction: function(context, functionName) {
+            if (context[functionName].constructor === Function &&
+                context[functionName]._instrumented &&
+                context[functionName]._instrumented.constructor === Function) {
+                context[functionName] = context[functionName]._instrumented;
+            }
+        },
+
+        /**
+         * Given an Error object, return a formatted Array based on Chrome's stack string.
+         *
+         * @param e - Error object to inspect
+         * @return Array<String> of function calls, files and line numbers
+         */
+        chrome: function(e) {
+            return (e.stack + '\n')
+                .replace(/^[\s\S]+?\s+at\s+/, ' at ') // remove message
+                .replace(/^\s+(at eval )?at\s+/gm, '') // remove 'at' and indentation
+                .replace(/^([^\(]+?)([\n$])/gm, '{anonymous}() ($1)$2')
+                .replace(/^Object.<anonymous>\s*\(([^\)]+)\)/gm, '{anonymous}() ($1)')
+                .replace(/^(.+) \((.+)\)$/gm, '$1@$2')
+                .split('\n')
+                .slice(0, -1);
+        },
+
+        /**
+         * Given an Error object, return a formatted Array based on Safari's stack string.
+         *
+         * @param e - Error object to inspect
+         * @return Array<String> of function calls, files and line numbers
+         */
+        safari: function(e) {
+            return e.stack.replace(/\[native code\]\n/m, '')
+                .replace(/^(?=\w+Error\:).*$\n/m, '')
+                .replace(/^@/gm, '{anonymous}()@')
+                .split('\n');
+        },
+
+        /**
+         * Given an Error object, return a formatted Array based on IE's stack string.
+         *
+         * @param e - Error object to inspect
+         * @return Array<String> of function calls, files and line numbers
+         */
+        ie: function(e) {
+            return e.stack
+                .replace(/^\s*at\s+(.*)$/gm, '$1')
+                .replace(/^Anonymous function\s+/gm, '{anonymous}() ')
+                .replace(/^(.+)\s+\((.+)\)$/gm, '$1@$2')
+                .split('\n')
+                .slice(1);
+        },
+
+        /**
+         * Given an Error object, return a formatted Array based on Firefox's stack string.
+         *
+         * @param e - Error object to inspect
+         * @return Array<String> of function calls, files and line numbers
+         */
+        firefox: function(e) {
+            return e.stack.replace(/(?:\n@:0)?\s+$/m, '')
+                .replace(/^(?:\((\S*)\))?@/gm, '{anonymous}($1)@')
+                .split('\n');
+        },
+
+        opera11: function(e) {
+            var ANON = '{anonymous}', lineRE = /^.*line (\d+), column (\d+)(?: in (.+))? in (\S+):$/;
+            var lines = e.stacktrace.split('\n'), result = [];
+
+            for (var i = 0, len = lines.length; i < len; i += 2) {
+                var match = lineRE.exec(lines[i]);
+                if (match) {
+                    var location = match[4] + ':' + match[1] + ':' + match[2];
+                    var fnName = match[3] || "global code";
+                    fnName = fnName.replace(/<anonymous function: (\S+)>/, "$1").replace(/<anonymous function>/, ANON);
+                    result.push(fnName + '@' + location + ' -- ' + lines[i + 1].replace(/^\s+/, ''));
+                }
+            }
+
+            return result;
+        },
+
+        opera10b: function(e) {
+            // "<anonymous function: run>([arguments not available])@file://localhost/G:/js/stacktrace.js:27\n" +
+            // "printStackTrace([arguments not available])@file://localhost/G:/js/stacktrace.js:18\n" +
+            // "@file://localhost/G:/js/test/functional/testcase1.html:15"
+            var lineRE = /^(.*)@(.+):(\d+)$/;
+            var lines = e.stacktrace.split('\n'), result = [];
+
+            for (var i = 0, len = lines.length; i < len; i++) {
+                var match = lineRE.exec(lines[i]);
+                if (match) {
+                    var fnName = match[1] ? (match[1] + '()') : "global code";
+                    result.push(fnName + '@' + match[2] + ':' + match[3]);
+                }
+            }
+
+            return result;
+        },
+
+        /**
+         * Given an Error object, return a formatted Array based on Opera 10's stacktrace string.
+         *
+         * @param e - Error object to inspect
+         * @return Array<String> of function calls, files and line numbers
+         */
+        opera10a: function(e) {
+            // "  Line 27 of linked script file://localhost/G:/js/stacktrace.js\n"
+            // "  Line 11 of inline#1 script in file://localhost/G:/js/test/functional/testcase1.html: In function foo\n"
+            var ANON = '{anonymous}', lineRE = /Line (\d+).*script (?:in )?(\S+)(?:: In function (\S+))?$/i;
+            var lines = e.stacktrace.split('\n'), result = [];
+
+            for (var i = 0, len = lines.length; i < len; i += 2) {
+                var match = lineRE.exec(lines[i]);
+                if (match) {
+                    var fnName = match[3] || ANON;
+                    result.push(fnName + '()@' + match[2] + ':' + match[1] + ' -- ' + lines[i + 1].replace(/^\s+/, ''));
+                }
+            }
+
+            return result;
+        },
+
+        // Opera 7.x-9.2x only!
+        opera9: function(e) {
+            // "  Line 43 of linked script file://localhost/G:/js/stacktrace.js\n"
+            // "  Line 7 of inline#1 script in file://localhost/G:/js/test/functional/testcase1.html\n"
+            var ANON = '{anonymous}', lineRE = /Line (\d+).*script (?:in )?(\S+)/i;
+            var lines = e.message.split('\n'), result = [];
+
+            for (var i = 2, len = lines.length; i < len; i += 2) {
+                var match = lineRE.exec(lines[i]);
+                if (match) {
+                    result.push(ANON + '()@' + match[2] + ':' + match[1] + ' -- ' + lines[i + 1].replace(/^\s+/, ''));
+                }
+            }
+
+            return result;
+        },
+
+        // Safari 5-, IE 9-, and others
+        other: function(curr) {
+            var ANON = '{anonymous}', fnRE = /function(?:\s+([\w$]+))?\s*\(/, stack = [], fn, args, maxStackSize = 10;
+            var slice = Array.prototype.slice;
+            while (curr && stack.length < maxStackSize) {
+                fn = fnRE.test(curr.toString()) ? RegExp.$1 || ANON : ANON;
+                try {
+                    args = slice.call(curr['arguments'] || []);
+                } catch (e) {
+                    args = ['Cannot access arguments: ' + e];
+                }
+                stack[stack.length] = fn + '(' + this.stringifyArguments(args) + ')';
+                try {
+                    curr = curr.caller;
+                } catch (e) {
+                    stack[stack.length] = 'Cannot access caller: ' + e;
+                    break;
+                }
+            }
+            return stack;
+        },
+
+        /**
+         * Given arguments array as a String, substituting type names for non-string types.
+         *
+         * @param {Arguments,Array} args
+         * @return {String} stringified arguments
+         */
+        stringifyArguments: function(args) {
+            var result = [];
+            var slice = Array.prototype.slice;
+            for (var i = 0; i < args.length; ++i) {
+                var arg = args[i];
+                if (arg === undefined) {
+                    result[i] = 'undefined';
+                } else if (arg === null) {
+                    result[i] = 'null';
+                } else if (arg.constructor) {
+                    // TODO constructor comparison does not work for iframes
+                    if (arg.constructor === Array) {
+                        if (arg.length < 3) {
+                            result[i] = '[' + this.stringifyArguments(arg) + ']';
+                        } else {
+                            result[i] = '[' + this.stringifyArguments(slice.call(arg, 0, 1)) + '...' + this.stringifyArguments(slice.call(arg, -1)) + ']';
+                        }
+                    } else if (arg.constructor === Object) {
+                        result[i] = '#object';
+                    } else if (arg.constructor === Function) {
+                        result[i] = '#function';
+                    } else if (arg.constructor === String) {
+                        result[i] = '"' + arg + '"';
+                    } else if (arg.constructor === Number) {
+                        result[i] = arg;
+                    } else {
+                        result[i] = '?';
+                    }
+                }
+            }
+            return result.join(',');
+        },
+
+        sourceCache: {},
+
+        /**
+         * @return {String} the text from a given URL
+         */
+        ajax: function(url) {
+            var req = this.createXMLHTTPObject();
+            if (req) {
+                try {
+                    req.open('GET', url, false);
+                    //req.overrideMimeType('text/plain');
+                    //req.overrideMimeType('text/javascript');
+                    req.send(null);
+                    //return req.status == 200 ? req.responseText : '';
+                    return req.responseText;
+                } catch (e) {
+                }
+            }
+            return '';
+        },
+
+        /**
+         * Try XHR methods in order and store XHR factory.
+         *
+         * @return {XMLHttpRequest} XHR function or equivalent
+         */
+        createXMLHTTPObject: function() {
+            var xmlhttp, XMLHttpFactories = [
+                function() {
+                    return new XMLHttpRequest();
+                }, function() {
+                    return new ActiveXObject('Msxml2.XMLHTTP');
+                }, function() {
+                    return new ActiveXObject('Msxml3.XMLHTTP');
+                }, function() {
+                    return new ActiveXObject('Microsoft.XMLHTTP');
+                }
+            ];
+            for (var i = 0; i < XMLHttpFactories.length; i++) {
+                try {
+                    xmlhttp = XMLHttpFactories[i]();
+                    // Use memoization to cache the factory
+                    this.createXMLHTTPObject = XMLHttpFactories[i];
+                    return xmlhttp;
+                } catch (e) {
+                }
+            }
+        },
+
+        /**
+         * Given a URL, check if it is in the same domain (so we can get the source
+         * via Ajax).
+         *
+         * @param url {String} source url
+         * @return {Boolean} False if we need a cross-domain request
+         */
+        isSameDomain: function(url) {
+            return typeof location !== "undefined" && url.indexOf(location.hostname) !== -1; // location may not be defined, e.g. when running from nodejs.
+        },
+
+        /**
+         * Get source code from given URL if in the same domain.
+         *
+         * @param url {String} JS source URL
+         * @return {Array} Array of source code lines
+         */
+        getSource: function(url) {
+            // TODO reuse source from script tags?
+            if (!(url in this.sourceCache)) {
+                this.sourceCache[url] = this.ajax(url).split('\n');
+            }
+            return this.sourceCache[url];
+        },
+
+        guessAnonymousFunctions: function(stack) {
+            for (var i = 0; i < stack.length; ++i) {
+                var reStack = /\{anonymous\}\(.*\)@(.*)/,
+                    reRef = /^(.*?)(?::(\d+))(?::(\d+))?(?: -- .+)?$/,
+                    frame = stack[i], ref = reStack.exec(frame);
+
+                if (ref) {
+                    var m = reRef.exec(ref[1]);
+                    if (m) { // If falsey, we did not get any file/line information
+                        var file = m[1], lineno = m[2], charno = m[3] || 0;
+                        if (file && this.isSameDomain(file) && lineno) {
+                            var functionName = this.guessAnonymousFunction(file, lineno, charno);
+                            stack[i] = frame.replace('{anonymous}', functionName);
+                        }
+                    }
+                }
+            }
+            return stack;
+        },
+
+        guessAnonymousFunction: function(url, lineNo, charNo) {
+            var ret;
+            try {
+                ret = this.findFunctionName(this.getSource(url), lineNo);
+            } catch (e) {
+                ret = 'getSource failed with url: ' + url + ', exception: ' + e.toString();
+            }
+            return ret;
+        },
+
+        findFunctionName: function(source, lineNo) {
+            // FIXME findFunctionName fails for compressed source
+            // (more than one function on the same line)
+            // function {name}({args}) m[1]=name m[2]=args
+            var reFunctionDeclaration = /function\s+([^(]*?)\s*\(([^)]*)\)/;
+            // {name} = function ({args}) TODO args capture
+            // /['"]?([0-9A-Za-z_]+)['"]?\s*[:=]\s*function(?:[^(]*)/
+            var reFunctionExpression = /['"]?([$_A-Za-z][$_A-Za-z0-9]*)['"]?\s*[:=]\s*function\b/;
+            // {name} = eval()
+            var reFunctionEvaluation = /['"]?([$_A-Za-z][$_A-Za-z0-9]*)['"]?\s*[:=]\s*(?:eval|new Function)\b/;
+            // Walk backwards in the source lines until we find
+            // the line which matches one of the patterns above
+            var code = "", line, maxLines = Math.min(lineNo, 20), m, commentPos;
+            for (var i = 0; i < maxLines; ++i) {
+                // lineNo is 1-based, source[] is 0-based
+                line = source[lineNo - i - 1];
+                commentPos = line.indexOf('//');
+                if (commentPos >= 0) {
+                    line = line.substr(0, commentPos);
+                }
+                // TODO check other types of comments? Commented code may lead to false positive
+                if (line) {
+                    code = line + code;
+                    m = reFunctionExpression.exec(code);
+                    if (m && m[1]) {
+                        return m[1];
+                    }
+                    m = reFunctionDeclaration.exec(code);
+                    if (m && m[1]) {
+                        //return m[1] + "(" + (m[2] || "") + ")";
+                        return m[1];
+                    }
+                    m = reFunctionEvaluation.exec(code);
+                    if (m && m[1]) {
+                        return m[1];
+                    }
+                }
+            }
+            return '(?)';
+        }
+    };
+
+    return printStackTrace;
+}));
diff --git a/js/loader.js b/js/loader.js
index 1195057d..90d75eeb 100644
--- a/js/loader.js
+++ b/js/loader.js
@@ -51,7 +51,7 @@ OC.ContactsImporter = OC.ContactsImporter || {
 						self.$dialog = null;
 					}
 				});
-				self.$importIntoSelect = self.$dialog.find('#import_into');
+				self.$importIntoSelect = $('#import_into');
 				self.$importIntoSelect.on('change', function() {
 					var $selected = $(this).find('option:selected');
 					if($(this).val() === '-1') {
diff --git a/templates/contacts.php b/templates/contacts.php
index c06e6440..224cc256 100644
--- a/templates/contacts.php
+++ b/templates/contacts.php
@@ -25,29 +25,8 @@ use OCA\Contacts\ImportManager;
 					<input type="text" tabindex="0" autofocus id="add-address-book" placeholder="<?php p($l->t('Display name')); ?>" title="<?php p($l->t('Add Address Book')); ?>" />
 				</div>
 				<div id="import">
-				<h2 data-id="import" tabindex="0" role="button"><?php p($l->t('Import')); ?></h2>
-					<ul>
-						<li class="import-upload">
-							<select id="import_into">
-								<option value="-1"><?php p($l->t('Import into...')); ?></option>
-							</select>
-							<select id="import_format">
-								<option value="automatic"><?php p($l->t('Automatic format')); ?></option>
-								<?php
-								$importManager = new ImportManager();
-								$types = $importManager->getTypes();
-								foreach ($types as $id => $label) {
-									echo "<option value=\"$id\">$label</option>";
-								}
-								?>
-							</select>
-							<button class="icon-upload svg tooltipped rightwards import-upload-button" title="<?php p($l->t('Select file...')); ?>"></button>
-							<input id="import_upload_start" class="tooltipped rightwards" title="<?php p($l->t('Select file...')); ?>" type="file" accept="text/vcard,text/x-vcard,text/directory" name="file" disabled />
-						</li>
-						<li class="import-status">
-							<label id="import-status-text"></label>
-							<div id="import-status-progress"></div>
-						</li>
+					<ul class="oc-addnew">
+						<li id="import-contacts"><a class="oc-addnew-init"><?php p($l->t('Import')); ?></a></li>
 					</ul>
 				</div>
 			</div> <!-- app-settings-content -->
@@ -507,3 +486,34 @@ use OCA\Contacts\ImportManager;
 	</span>
 </li>
 </script>
+
+<script id="contactsImportTemplate" class="hidden" type="text/template">
+<div id="contacts-import-div" class="contacts-import-class">
+<p>
+	<ul>
+		<!--<li data-id="import" tabindex="0" role="button"><?php p($l->t('Import')); ?></li>-->
+		<li class="import-upload">
+			<select id="import_into">
+				<option value="-1"><?php p($l->t('Import into...')); ?></option>
+			</select>
+			<select id="import_format">
+				<option value="automatic"><?php p($l->t('Automatic format')); ?></option>
+				<?php
+				$importManager = new ImportManager();
+				$types = $importManager->getTypes();
+				foreach ($types as $id => $label) {
+					echo "<option value=\"$id\">$label</option>";
+				}
+				?>
+			</select>
+			<button class="icon-upload svg tooltipped import-upload-button" title="<?php p($l->t('Select file...')); ?>"></button>
+			<input id="import_upload_start" class="tooltipped" title="<?php p($l->t('Select file...')); ?>" type="file" accept="text/vcard,text/x-vcard,text/directory" name="file" disabled />
+		</li>
+		<li class="import-status">
+			<label id="import-status-text"></label>
+			<div id="import-status-progress"></div>
+		</li>
+	</ul>
+</p>
+</div>
+</script>

From b89b933a98e85ba62b039a2a59861013ff4fe84b Mon Sep 17 00:00:00 2001
From: babelouest <mail@babelouest.org>
Date: Mon, 5 May 2014 15:20:19 -0400
Subject: [PATCH 2/5] remove buildImportSelect2()

---
 js/addressbooks.js | 31 +------------------------------
 1 file changed, 1 insertion(+), 30 deletions(-)

diff --git a/js/addressbooks.js b/js/addressbooks.js
index 9e0f0a47..fa571cc6 100644
--- a/js/addressbooks.js
+++ b/js/addressbooks.js
@@ -358,7 +358,7 @@ OC.Contacts = OC.Contacts || {};
 					$divDlg.ocdialog().ocdialog('destroy').remove();
 				},
 				open: function(/*event, ui*/) {
-					self.buildImportSelect2();
+					self.buildImportSelect();
 				}
 			});
 		});
@@ -515,35 +515,6 @@ OC.Contacts = OC.Contacts || {};
 		}
 	};
 
-	/**
-	 * Rebuild the select to choose which address book to import into.
-	 */
-	AddressBookList.prototype.buildImportSelect2 = function() {
-		console.log('buildImportSelect2', this);
-		var self = this;
-		this.$importIntoSelect.find('option:not([value="-1"])').remove();
-		var addressBooks = self.selectByPermission(OC.PERMISSION_UPDATE);
-		if (addressBooks.length > 0) {
-			console.log('ImportInto Select', self.$importIntoSelect);
-			//console.log('addressbooks', addressBooks);
-			$.each(addressBooks, function(idx, book) {
-				var $opt = $('<option />');
-				$opt.val(book.getId()).text(book.getDisplayName()).data('backend', book.getBackend());
-				self.$importIntoSelect.append($opt);
-				console.log('appending2', $opt, 'to', self.$importIntoSelect);
-			});
-			if(!this.isFileAction) {
-				if(addressBooks.length === 1) {
-					this.$importIntoSelect.val(this.$importIntoSelect.find('option:not([value="-1"])').first().val()).hide().trigger('change');
-					self.$importFileInput.prop('disabled', false);
-				} else {
-					this.$importIntoSelect.show();
-					self.$importFileInput.prop('disabled', true);
-				}
-			}
-		}
-	};
-
 	/**
 	 * Create an AddressBook object, save it in internal list and append it's rendered result to the list
 	 *

From f3272ad1594c00735406a5e4ba2961af72ebcf05 Mon Sep 17 00:00:00 2001
From: babelouest <mail@babelouest.org>
Date: Wed, 7 May 2014 16:54:58 -0400
Subject: [PATCH 3/5] reimplemented import ui in a ocdialog

---
 js/addressbooks.js                     | 187 ++++++++++++++++---------
 lib/connector/importvcardconnector.php |  13 +-
 lib/controller/importcontroller.php    |  10 +-
 templates/contacts.php                 |   3 +-
 4 files changed, 137 insertions(+), 76 deletions(-)

diff --git a/js/addressbooks.js b/js/addressbooks.js
index fa571cc6..76016349 100644
--- a/js/addressbooks.js
+++ b/js/addressbooks.js
@@ -253,15 +253,15 @@ OC.Contacts = OC.Contacts || {};
 		this.$bookList = this.$bookTemplate.find('.addressbooklist');
 		this.$bookItemTemplate = bookItemTemplate;
 		this.$importIntoSelect = $('#import_into');
-		this.$importFormatSelect = this.$bookTemplate.find('#import_format');
-		this.$importProgress = this.$bookTemplate.find('#import-status-progress');
-		this.$importStatusText = this.$bookTemplate.find('#import-status-text');
+		this.$importFormatSelect = $('#import_format');
+		this.$importProgress = $('#import-status-progress');
+		this.$importStatusText = $('#import-status-text');
 		this.addressBooks = [];
 
 		if(this.isFileAction) {
 			return;
 		}
-		this.$importFileInput = this.$bookTemplate.find('#import_upload_start');
+		this.$importFileInput = $('#import_upload_start');
 		var $addInput = this.$bookTemplate.find('#add-address-book');
 		$addInput.addnew({
 			ok: function(event, name) {
@@ -287,43 +287,71 @@ OC.Contacts = OC.Contacts || {};
 		$(document).bind('status.addressbook.added', function() {
 			self.buildImportSelect();
 		})
-		this.$importFormatSelect.on('change', function() {
-			self.$importIntoSelect.trigger('change');
+		$('#oc-import-nocontact').unbind('click').click(function(event) {
+			console.log("triggered", event);
+			self.importDialog();
 		});
-		this.$importIntoSelect.on('change', function() {
-			// Disable file input if no address book selected
-			var value = $(this).val();
-			self.$importFileInput.prop('disabled', value === '-1' );
-			if(value !== '-1') {
-				var url = OC.generateUrl(
-					'apps/contacts/addressbook/{backend}/{addressBookId}/{importType}/import/upload',
-					{
-						addressBookId:value,
-						importType:self.$importFormatSelect.find('option:selected').val(),
-						backend: $(this).find('option:selected').data('backend')
+		$('#import-contacts').unbind('click').click(function() {
+			console.log("Import clicked");
+			self.importDialog();
+		});
+	};
+	
+	AddressBookList.prototype.importDialog = function() {
+		var $rightContent = $('#app-content');
+		$rightContent.append('<div id="import-dialog"></div>');
+		var $dlg = $('#contactsImportTemplate').clone().octemplate();
+		var $divDlg = $('#import-dialog');
+		var self = this;
+		$divDlg.html($dlg).ocdialog({
+			modal: true,
+			closeOnEscape: true,
+			title: t('contacts', 'Import contacts'),
+			height: '220',
+			width: 'auto',
+			buttons: [
+				{
+					text: t('contacts', 'Close'),
+					click: function() {
+						$('#import-dialog').ocdialog('close').ocdialog('destroy').remove();
 					}
-				);
-				self.$importFileInput.fileupload('option', 'url', url);
+				}
+			],
+			close: function(/*event, ui*/) {
+				$('#import-dialog').ocdialog('close').ocdialog('destroy').remove();
+			},
+			open: function(/*event, ui*/) {
+				self.openImportDialog();
 			}
 		});
+	}
+	
+	AddressBookList.prototype.openImportDialog = function() {
+		this.$importIntoSelect = $('#import_into');
+		this.$importFormatSelect = $('#import_format');
+		this.$importProgress = $('#import-status-progress');
+		this.$importStatusText = $('#import-status-text');
+		this.$importFileInput = $('#import_upload_start');
+		var me = this;
+		var self = this;
 		this.$importFileInput.fileupload({
 			dataType: 'json',
 			start: function(e, data) {
-				self.$importProgress.progressbar({value:false});
+				me.$importProgress.progressbar({value:false});
 				$('.tipsy').remove();
 				$('.import-upload').hide();
 				$('.import-status').show();
-				self.$importProgress.fadeIn();
-				self.$importStatusText.text(t('contacts', 'Starting file import'));
+				me.$importProgress.fadeIn();
+				me.$importStatusText.text(t('contacts', 'Starting file import'));
 			},
 			done: function (e, data) {
-				if ($('#import_format').find('option:selected').val() != 'automatic') {
-					$('#import-status-text').text(t('contacts', 'Format selected: {format}',
+				if (me.$importFormatSelect.find('option:selected').val() != 'automatic') {
+					me.$importStatusText.text(t('contacts', 'Format selected: {format}',
 													{format: $('#import_format').find('option:selected').text() }));
 				} else {
-					$('#import-status-text').text(t('contacts', 'Automatic format detection'));
+					me.$importStatusText.text(t('contacts', 'Automatic format detection'));
 				}
-				console.log('Upload done:', data);
+				console.log('Upload done:', self.addressBooks);
 				self.doImport(self.storage.formatResponse(data.jqXHR));
 			},
 			fail: function(e, data) {
@@ -333,46 +361,68 @@ OC.Contacts = OC.Contacts || {};
 				$('.import-status').hide();
 			}
 		});
-		$('#import-contacts').on('click keypress', function() {
-			var $rightContent = $('#app-content');
-			$rightContent.append('<div id="import-dialog"></div>');
-			var $dlg = $('#contactsImportTemplate').octemplate();
-			var $divDlg = $('#import-dialog');
-			$divDlg.html($dlg).ocdialog({
-				modal: true,
-				closeOnEscape: true,
-				title: t('contacts', 'Import contacts'),
-				height: '220',
-				width: 'auto',
-				buttons: [
+		var $import_into = $('#import_into');
+		$import_into.change(function() {
+			if ($(this).val() != '-1') {
+				var url = OC.generateUrl(
+					'apps/contacts/addressbook/{backend}/{addressBookId}/{importType}/import/upload',
 					{
-						text: t('contacts', 'Close'),
-						click: function() {
-							$divDlg.ocdialog().ocdialog('close');
-							$divDlg.ocdialog().ocdialog('destroy').remove();
-						}
+						addressBookId:$import_into.val(),
+						importType:me.$importFormatSelect.find('option:selected').val(),
+						backend: $import_into.find('option:selected').attr('backend')
 					}
-				],
-				close: function(/*event, ui*/) {
-					$divDlg.ocdialog().ocdialog('close');
-					$divDlg.ocdialog().ocdialog('destroy').remove();
-				},
-				open: function(/*event, ui*/) {
-					self.buildImportSelect();
-				}
-			});
+				);
+				me.$importFileInput.fileupload('option', 'url', url);
+				me.$importFileInput.attr('disabled', false);
+			} else {
+				me.$importFileInput.attr('disabled', true);
+			}
 		});
-	};
+		$.when(self.storage.getAddressBooksForUser()).then(function(response) {
+			if(!response.error) {
+				$import_into.empty();
+				var $option = $('<option value="-1">' + t('contacts', 'Import into...') + '</option>');
+				$import_into.append($option);
+				var nbOptions = 0;
+				$.each(response.data.addressbooks, function(idx, addressBook) {
+					if (addressBook.permissions & OC.PERMISSION_UPDATE) {
+						var $option=$('<option></option>').val(addressBook.id).html(addressBook.displayname).attr('backend', addressBook.backend);
+						self.insertAddressBook(addressBook);
+						$import_into.append($option);
+						nbOptions++;
+					}
+				});
+				if (nbOptions === 1) {
+					$import_into.val($import_into.find('option:not([value="-1"])').first().val());
+					$import_into.attr('disabled', true);
+					me.$importFileInput.attr('disabled', false);
+					var url = OC.generateUrl(
+						'apps/contacts/addressbook/{backend}/{addressBookId}/{importType}/import/upload',
+						{
+							addressBookId:$import_into.val(),
+							importType:me.$importFormatSelect.find('option:selected').val(),
+							backend: $import_into.find('option:selected').attr('backend')
+						}
+					);
+					me.$importFileInput.fileupload('option', 'url', url);
+				}
+			} else {
+				console.log('status.contacts.error', response);
+			}
+		});
+	}
 
 	AddressBookList.prototype.count = function() {
 		return this.addressBooks.length;
 	};
 
 	/**
-	 * For importing from oC filesyatem
+	 * For importing from oC filesystem
 	 */
 	AddressBookList.prototype.prepareImport = function(backend, addressBookId, importType, path, fileName) {
 		console.log('prepareImport', backend, addressBookId, importType, path, fileName);
+		this.$importStatusText = $('#import-status-text');
+		this.$importProgress = $('#import-status-progress');
 		this.$importProgress.progressbar({value:false});
 		if (importType != 'automatic') {
 			this.$importStatusText.text(t('contacts', 'Format selected: {format}',
@@ -388,21 +438,14 @@ OC.Contacts = OC.Contacts || {};
 
 	AddressBookList.prototype.doImport = function(response) {
 		console.log('doImport', response);
+		this.$importProgress = $('#import-status-progress');
+		this.$importStatusText = $('#import-status-text');
 		var defer = $.Deferred();
 		var done = false;
 		var interval = null, isChecking = false;
 		var self = this;
 		var closeImport = function() {
 			defer.resolve();
-			self.$importProgress.fadeOut();
-			setTimeout(function() {
-				$('.import-upload').show();
-				$('.import-status').hide();
-				self.importCount = null;
-				if(self.$importProgress.hasClass('ui-progressbar')) {
-					self.$importProgress.progressbar('destroy');
-				}
-			}, 3000);
 		};
 		if(!response.error) {
 			this.$importProgress.progressbar('value', 0);
@@ -426,6 +469,7 @@ OC.Contacts = OC.Contacts || {};
 					if(!response.error) {
 						console.log('status, response: ', response);
 						if (response.data.total != null && response.data.progress != null) {
+							console.log('response.data', response.data);
 							self.$importProgress.progressbar('option', 'max', Number(response.data.total));
 							self.$importProgress.progressbar('value', Number(response.data.progress));
 							self.$importStatusText.text(t('contacts', 'Processing {count}/{total} cards',
@@ -442,6 +486,7 @@ OC.Contacts = OC.Contacts || {};
 					isChecking = false;
 				});
 			};
+			console.log('vertige', data);
 			$.when(
 				self.storage.startImport(
 					data.backend, data.addressBookId, data.importType,
@@ -454,7 +499,11 @@ OC.Contacts = OC.Contacts || {};
 					console.log('Import done');
 					self.$importStatusText.text(t('contacts', 'Total:{total}, Success:{imported}, Errors:{failed}',
 													  {total: response.data.total, imported:response.data.imported, failed: response.data.failed}));
-					var addressBook = self.find({id:response.data.addressBookId, backend: response.data.backend});
+					self.$importProgress.progressbar('option', 'max', response.data.total);
+					self.$importProgress.progressbar('value', response.data.total);
+					self.buildImportSelect();
+					var addressBook = self.find({id:data.addressBookId, backend: data.backend});
+					console.log('addressBook', self.count(), self.addressBooks);
 					$(document).trigger('status.addressbook.imported', {
 						addressbook: addressBook
 					});
@@ -471,9 +520,9 @@ OC.Contacts = OC.Contacts || {};
 				$(document).trigger('status.contacts.error', response);
 				done = true;
 			});
-			interval = setInterval(function() {
+			/*interval = setInterval(function() {
 				getStatus(data.backend, data.addressBookId, data.importType, data.progresskey, interval, done);
-			}, 1500);
+			}, 1500);*/
 		} else {
 			defer.reject(response);
 			done = true;
@@ -489,12 +538,12 @@ OC.Contacts = OC.Contacts || {};
 	 */
 	AddressBookList.prototype.buildImportSelect = function() {
 		console.log('buildImportSelect', this);
-		var self = this;
+		/*var self = this;
 		this.$importIntoSelect.find('option:not([value="-1"])').remove();
 		var addressBooks = self.selectByPermission(OC.PERMISSION_UPDATE);
 		if (addressBooks.length > 0) {
 			console.log('ImportInto Select', self.$importIntoSelect);
-			//console.log('addressbooks', addressBooks);
+			console.log('addressbooks', addressBooks);
 			$.each(addressBooks, function(idx, book) {
 				var $opt = $('<option />');
 				$opt.val(book.getId()).text(book.getDisplayName()).data('backend', book.getBackend());
@@ -512,7 +561,7 @@ OC.Contacts = OC.Contacts || {};
 					self.$importFileInput.prop('disabled', true);
 				}
 			}
-		}
+		}*/
 	};
 
 	/**
diff --git a/lib/connector/importvcardconnector.php b/lib/connector/importvcardconnector.php
index 1bcc6174..35615b81 100755
--- a/lib/connector/importvcardconnector.php
+++ b/lib/connector/importvcardconnector.php
@@ -45,7 +45,10 @@ class ImportVCardConnector extends ImportConnector{
 		
 		$elements = array();
 		foreach($parts as $part) {
-			$elements[] = $this->convertElementToVCard($part);
+			$converted = $this->convertElementToVCard($part);
+			if ($converted) {
+				$elements[] = $converted;
+			}
 		}
 		
 		return array_values($elements);
@@ -100,10 +103,14 @@ class ImportVCardConnector extends ImportConnector{
 	/**
 	 * @brief converts a VCard into a owncloud VCard
 	 * @param $element the VCard element to convert
-	 * @return VCard
+	 * @return VCard|false
 	 */
 	public function convertElementToVCard($element) {
-		$source = VObject\Reader::read($element);
+		try {
+			$source = VObject\Reader::read($element, VObject\Reader::OPTION_FORGIVING);
+		} catch (VObject\ParseException $error) {
+			return false;
+		}
 		$dest = \Sabre\VObject\Component::create('VCARD');
 		
 		foreach ($source->children() as $sourceProperty) {
diff --git a/lib/controller/importcontroller.php b/lib/controller/importcontroller.php
index 4a0eeeb1..2d05807d 100644
--- a/lib/controller/importcontroller.php
+++ b/lib/controller/importcontroller.php
@@ -258,7 +258,7 @@ class ImportController extends Controller {
 						$favourites = $part->select('X-FAVOURITES');
 						foreach ($favourites as $favourite) {
 							if ($favourite->getValue() == 'yes') {
-								$tagMgr = $this->server->getTagManager()->load('contact');
+								$tagMgr = \OC::$server->getTagManager()->load('contact');
 								$tagMgr->addToFavorites($id);
 							}
 						}
@@ -307,9 +307,13 @@ class ImportController extends Controller {
 			$response->bailOut(App::$l10n->t('Progress key missing from request.'));
 			return $response;
 		}
-
-		error_log("progresskey: ".$this->cache->get($progresskey)." total: ".$this->cache->get($progresskey.'_total') );
 		$response->setParams(array('progress' => $this->cache->get($progresskey), 'total' => $this->cache->get($progresskey.'_total') ));
 		return $response;
 	}
+
+	/**
+	 * @NoAdminRequired
+	 */
+	public function detectFileType() {
+	}
 }
diff --git a/templates/contacts.php b/templates/contacts.php
index 224cc256..6ea659fb 100644
--- a/templates/contacts.php
+++ b/templates/contacts.php
@@ -106,6 +106,7 @@ use OCA\Contacts\ImportManager;
 				<p><?php p($l->t('Add a new contact or import existing contacts from a VCF file.')); ?></p>
 				<div id="selections">
 					<input type="button" class="add-contact text" value="<?php p($l->t('New contact')) ?>">
+					<input type="button" id="oc-import-nocontact" value="<?php p($l->t('Import contacts')); ?>">
 				</div>
 			</div>
 		</div>
@@ -507,7 +508,7 @@ use OCA\Contacts\ImportManager;
 				?>
 			</select>
 			<button class="icon-upload svg tooltipped import-upload-button" title="<?php p($l->t('Select file...')); ?>"></button>
-			<input id="import_upload_start" class="tooltipped" title="<?php p($l->t('Select file...')); ?>" type="file" accept="text/vcard,text/x-vcard,text/directory" name="file" disabled />
+			<input id="import_upload_start" class="tooltipped" title="<?php p($l->t('Select file...')); ?>" type="file" name="file" disabled />
 		</li>
 		<li class="import-status">
 			<label id="import-status-text"></label>

From da0d990472c04106e27b6930e13a4c2bc06c8a58 Mon Sep 17 00:00:00 2001
From: babelouest <mail@babelouest.org>
Date: Wed, 7 May 2014 22:46:22 -0400
Subject: [PATCH 4/5] adapted import ui to fit in the ocdialog might be some
 bugs left though

---
 css/contacts.css                    | 21 ++++++---
 js/addressbooks.js                  | 70 ++++++-----------------------
 js/loader.js                        |  2 +-
 lib/controller/importcontroller.php |  6 ---
 templates/contacts.php              | 54 +++++++++++-----------
 5 files changed, 60 insertions(+), 93 deletions(-)

diff --git a/css/contacts.css b/css/contacts.css
index d3a917e4..34cf48d9 100644
--- a/css/contacts.css
+++ b/css/contacts.css
@@ -446,16 +446,16 @@ dt[data-element="org"] { margin-top: 4px; }
 }
 
 /* Single elements */
-#file_upload_form, #file_upload_target, #import_upload_target, #crop_target { display:none; }
-#import_upload_start, .import-upload-button {
+#file_upload_form { display:none; }
+#contacts-import-upload-start, .import-upload-button {
     width: 30px !important; height: 30px !important;
 	display:block;
 	position: absolute;
-	right: 0; top: 0;
+	right: 0; bottom: 0;
 	margin: 5px !important;
 	cursor: pointer;
 }
-#import_upload_start {
+#contacts-import-upload-start {
 	cursor: pointer;
 	z-index: 1001;
 }
@@ -530,7 +530,7 @@ input[type=checkbox].propertytype { width: 10px; }
 	background-size: 80%;
 }
 #phototools li a:hover { opacity: 0.8; }
-#contactphoto_fileupload, #import_upload_start { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; filter:alpha(opacity=0); opacity:0; z-index:1001; }
+#contactphoto_fileupload, #contacts-import-upload-start { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; filter:alpha(opacity=0); opacity:0; z-index:1001; }
 
 #dialog-merge-contacts .mergelist {
 	margin: 10px;
@@ -850,6 +850,17 @@ tbody tr.contact.active, tbody tr.contact:hover {
 	}
 }
 
+#contacts-import-div > p > select {
+	width:200px;
+	display: inline-block;
+}
+
+#contacts-import-div > p > label {
+	vertical-align:top;
+	width:200px;
+	display: inline-block;
+}
+
 @media screen and (max-width: 1400px) {
 	#contactlist tr td.categories { display: none; }
 	#contactsHeader tr td.categories { display: none; }
diff --git a/js/addressbooks.js b/js/addressbooks.js
index 76016349..130f88d2 100644
--- a/js/addressbooks.js
+++ b/js/addressbooks.js
@@ -252,8 +252,8 @@ OC.Contacts = OC.Contacts || {};
 		this.$bookTemplate = bookTemplate;
 		this.$bookList = this.$bookTemplate.find('.addressbooklist');
 		this.$bookItemTemplate = bookItemTemplate;
-		this.$importIntoSelect = $('#import_into');
-		this.$importFormatSelect = $('#import_format');
+		this.$importIntoSelect = $('#contacts-import-into');
+		this.$importFormatSelect = $('#contacts-import-format');
 		this.$importProgress = $('#import-status-progress');
 		this.$importStatusText = $('#import-status-text');
 		this.addressBooks = [];
@@ -261,7 +261,7 @@ OC.Contacts = OC.Contacts || {};
 		if(this.isFileAction) {
 			return;
 		}
-		this.$importFileInput = $('#import_upload_start');
+		this.$importFileInput = $('#contacts-import-upload-start');
 		var $addInput = this.$bookTemplate.find('#add-address-book');
 		$addInput.addnew({
 			ok: function(event, name) {
@@ -282,11 +282,7 @@ OC.Contacts = OC.Contacts || {};
 		$(document).bind('status.addressbook.removed', function(e, data) {
 			var addressBook = data.addressbook;
 			self.addressBooks.splice(self.addressBooks.indexOf(addressBook), 1);
-			self.buildImportSelect();
 		});
-		$(document).bind('status.addressbook.added', function() {
-			self.buildImportSelect();
-		})
 		$('#oc-import-nocontact').unbind('click').click(function(event) {
 			console.log("triggered", event);
 			self.importDialog();
@@ -327,11 +323,11 @@ OC.Contacts = OC.Contacts || {};
 	}
 	
 	AddressBookList.prototype.openImportDialog = function() {
-		this.$importIntoSelect = $('#import_into');
-		this.$importFormatSelect = $('#import_format');
+		this.$importIntoSelect = $('#contacts-import-into');
+		this.$importFormatSelect = $('#contacts-import-format');
 		this.$importProgress = $('#import-status-progress');
 		this.$importStatusText = $('#import-status-text');
-		this.$importFileInput = $('#import_upload_start');
+		this.$importFileInput = $('#contacts-import-upload-start');
 		var me = this;
 		var self = this;
 		this.$importFileInput.fileupload({
@@ -339,7 +335,6 @@ OC.Contacts = OC.Contacts || {};
 			start: function(e, data) {
 				me.$importProgress.progressbar({value:false});
 				$('.tipsy').remove();
-				$('.import-upload').hide();
 				$('.import-status').show();
 				me.$importProgress.fadeIn();
 				me.$importStatusText.text(t('contacts', 'Starting file import'));
@@ -347,7 +342,7 @@ OC.Contacts = OC.Contacts || {};
 			done: function (e, data) {
 				if (me.$importFormatSelect.find('option:selected').val() != 'automatic') {
 					me.$importStatusText.text(t('contacts', 'Format selected: {format}',
-													{format: $('#import_format').find('option:selected').text() }));
+													{format: $('#contacts-import-format').find('option:selected').text() }));
 				} else {
 					me.$importStatusText.text(t('contacts', 'Automatic format detection'));
 				}
@@ -357,11 +352,10 @@ OC.Contacts = OC.Contacts || {};
 			fail: function(e, data) {
 				console.log('fail', data);
 				OC.notify({message:data.errorThrown + ': ' + data.textStatus});
-				$('.import-upload').show();
 				$('.import-status').hide();
 			}
 		});
-		var $import_into = $('#import_into');
+		var $import_into = $('#contacts-import-into');
 		$import_into.change(function() {
 			if ($(this).val() != '-1') {
 				var url = OC.generateUrl(
@@ -387,7 +381,7 @@ OC.Contacts = OC.Contacts || {};
 				$.each(response.data.addressbooks, function(idx, addressBook) {
 					if (addressBook.permissions & OC.PERMISSION_UPDATE) {
 						var $option=$('<option></option>').val(addressBook.id).html(addressBook.displayname).attr('backend', addressBook.backend);
-						self.insertAddressBook(addressBook);
+						self.insertAddressBook(addressBook, false);
 						$import_into.append($option);
 						nbOptions++;
 					}
@@ -497,11 +491,11 @@ OC.Contacts = OC.Contacts || {};
 				console.log('response', response);
 				if(!response.error) {
 					console.log('Import done');
+					$('#contacts-import-upload').hide();
 					self.$importStatusText.text(t('contacts', 'Total:{total}, Success:{imported}, Errors:{failed}',
 													  {total: response.data.total, imported:response.data.imported, failed: response.data.failed}));
 					self.$importProgress.progressbar('option', 'max', response.data.total);
 					self.$importProgress.progressbar('value', response.data.total);
-					self.buildImportSelect();
 					var addressBook = self.find({id:data.addressBookId, backend: data.backend});
 					console.log('addressBook', self.count(), self.addressBooks);
 					$(document).trigger('status.addressbook.imported', {
@@ -520,9 +514,6 @@ OC.Contacts = OC.Contacts || {};
 				$(document).trigger('status.contacts.error', response);
 				done = true;
 			});
-			/*interval = setInterval(function() {
-				getStatus(data.backend, data.addressBookId, data.importType, data.progresskey, interval, done);
-			}, 1500);*/
 		} else {
 			defer.reject(response);
 			done = true;
@@ -533,54 +524,23 @@ OC.Contacts = OC.Contacts || {};
 		return defer;
 	};
 
-	/**
-	 * Rebuild the select to choose which address book to import into.
-	 */
-	AddressBookList.prototype.buildImportSelect = function() {
-		console.log('buildImportSelect', this);
-		/*var self = this;
-		this.$importIntoSelect.find('option:not([value="-1"])').remove();
-		var addressBooks = self.selectByPermission(OC.PERMISSION_UPDATE);
-		if (addressBooks.length > 0) {
-			console.log('ImportInto Select', self.$importIntoSelect);
-			console.log('addressbooks', addressBooks);
-			$.each(addressBooks, function(idx, book) {
-				var $opt = $('<option />');
-				$opt.val(book.getId()).text(book.getDisplayName()).data('backend', book.getBackend());
-				self.$importIntoSelect.append($opt);
-				console.log('appending', $opt, 'to', self.$importIntoSelect);
-			});
-			if(!this.isFileAction) {
-				if(addressBooks.length === 1) {
-					//console.log("coin !");
-					this.$importIntoSelect.val(this.$importIntoSelect.find('option:not([value="-1"])').first().val()).hide().trigger('change');
-					self.$importFileInput.prop('disabled', false);
-				} else {
-					//console.log("coin !!!");
-					this.$importIntoSelect.show();
-					self.$importFileInput.prop('disabled', true);
-				}
-			}
-		}*/
-	};
-
 	/**
 	 * Create an AddressBook object, save it in internal list and append it's rendered result to the list
 	 *
 	 * @param object addressBook
-	 * @param bool rebuild If true rebuild the address book select for import.
+	 * @param bool rendered If true add the addressbook to the addressbook list
 	 * @return AddressBook
 	 */
-	AddressBookList.prototype.insertAddressBook = function(addressBook) {
+	AddressBookList.prototype.insertAddressBook = function(addressBook, rendered = true) {
 		var book = new AddressBook(this.storage, addressBook, this.$bookItemTemplate, this.isFileAction);
-		if(!this.isFileAction) {
+		if(!this.isFileAction && rendered) {
 			var result = book.render();
 			this.$bookList.append(result);
 		}
 		this.addressBooks.push(book);
 		return book;
 	};
-
+	
 	/**
 	 * Get an AddressBook
 	 *
@@ -715,8 +675,6 @@ OC.Contacts = OC.Contacts || {};
 				$.each(response.data.addressbooks, function(idx, addressBook) {
 					self.insertAddressBook(addressBook);
 				});
-				self.buildImportSelect();
-				console.log('After buildImportSelect');
 				if(!self.isFileAction) {
 					if(typeof OC.Share !== 'undefined') {
 						OC.Share.loadIcons('addressbook');
diff --git a/js/loader.js b/js/loader.js
index 90d75eeb..ae40178c 100644
--- a/js/loader.js
+++ b/js/loader.js
@@ -51,7 +51,7 @@ OC.ContactsImporter = OC.ContactsImporter || {
 						self.$dialog = null;
 					}
 				});
-				self.$importIntoSelect = $('#import_into');
+				self.$importIntoSelect = $('#contacts-import-into');
 				self.$importIntoSelect.on('change', function() {
 					var $selected = $(this).find('option:selected');
 					if($(this).val() === '-1') {
diff --git a/lib/controller/importcontroller.php b/lib/controller/importcontroller.php
index 2d05807d..ecd7d268 100644
--- a/lib/controller/importcontroller.php
+++ b/lib/controller/importcontroller.php
@@ -310,10 +310,4 @@ class ImportController extends Controller {
 		$response->setParams(array('progress' => $this->cache->get($progresskey), 'total' => $this->cache->get($progresskey.'_total') ));
 		return $response;
 	}
-
-	/**
-	 * @NoAdminRequired
-	 */
-	public function detectFileType() {
-	}
 }
diff --git a/templates/contacts.php b/templates/contacts.php
index 6ea659fb..00e3f513 100644
--- a/templates/contacts.php
+++ b/templates/contacts.php
@@ -490,31 +490,35 @@ use OCA\Contacts\ImportManager;
 
 <script id="contactsImportTemplate" class="hidden" type="text/template">
 <div id="contacts-import-div" class="contacts-import-class">
-<p>
-	<ul>
-		<!--<li data-id="import" tabindex="0" role="button"><?php p($l->t('Import')); ?></li>-->
-		<li class="import-upload">
-			<select id="import_into">
-				<option value="-1"><?php p($l->t('Import into...')); ?></option>
-			</select>
-			<select id="import_format">
-				<option value="automatic"><?php p($l->t('Automatic format')); ?></option>
-				<?php
-				$importManager = new ImportManager();
-				$types = $importManager->getTypes();
-				foreach ($types as $id => $label) {
-					echo "<option value=\"$id\">$label</option>";
-				}
-				?>
-			</select>
-			<button class="icon-upload svg tooltipped import-upload-button" title="<?php p($l->t('Select file...')); ?>"></button>
-			<input id="import_upload_start" class="tooltipped" title="<?php p($l->t('Select file...')); ?>" type="file" name="file" disabled />
-		</li>
-		<li class="import-status">
-			<label id="import-status-text"></label>
-			<div id="import-status-progress"></div>
-		</li>
-	</ul>
+<p id="contacts-import-into-p">
+	<label for="contacts-import-into"><?php p($l->t('Addresbook')); ?></label>
+	<select id="contacts-import-into">
+		<option value="-1"><?php p($l->t('Import into...')); ?></option>
+	</select>
+</p>
+<p id="contacts-import-format-p">
+	<label for="contacts-import-into"><?php p($l->t('Format')); ?></label>
+	<select id="contacts-import-format">
+		<option value="automatic"><?php p($l->t('Automatic format')); ?></option>
+		<?php
+		$importManager = new ImportManager();
+		$types = $importManager->getTypes();
+		foreach ($types as $id => $label) {
+			echo "<option value=\"$id\">$label</option>";
+		}
+		?>
+	</select>
+</p>
+<p id="contacts-import-upload">
+	<!--<label for="contacts-import-upload"><?php p($l->t('Select file')); ?></label>-->
+	<button class="icon-upload svg tooltipped import-upload-button" title="<?php p($l->t('Select file...')); ?>"></button>
+	<input id="contacts-import-upload-start" class="tooltipped" title="<?php p($l->t('Select file...')); ?>" type="file" name="file" disabled />
+</p>
+<p id="contacts-import-status">
+	<div class="import-status">
+		<label id="import-status-text"></label>
+		<div id="import-status-progress"></div>
+	</div>
 </p>
 </div>
 </script>

From 1ba63234ac42315bb805e8022fbc21ae23d16166 Mon Sep 17 00:00:00 2001
From: babelouest <mail@babelouest.org>
Date: Wed, 7 May 2014 22:51:13 -0400
Subject: [PATCH 5/5] removed unnecessary debugging functions

---
 js/addressbooks.js | 492 ---------------------------------------------
 1 file changed, 492 deletions(-)

diff --git a/js/addressbooks.js b/js/addressbooks.js
index 130f88d2..6f0f710f 100644
--- a/js/addressbooks.js
+++ b/js/addressbooks.js
@@ -703,495 +703,3 @@ OC.Contacts = OC.Contacts || {};
 	OC.Contacts.AddressBookList = AddressBookList;
 
 })(window, jQuery, OC);
-
-
-////////////////////////////////////////////////////////
-// Domain Public by Eric Wendelin http://eriwen.com/ (2008)
-//                  Luke Smith http://lucassmith.name/ (2008)
-//                  Loic Dachary <loic@dachary.org> (2008)
-//                  Johan Euphrosine <proppy@aminche.com> (2008)
-//                  Oyvind Sean Kinsey http://kinsey.no/blog (2010)
-//                  Victor Homyakov <victor-homyakov@users.sourceforge.net> (2010)
-/*global module, exports, define, ActiveXObject*/
-(function(global, factory) {
-    if (typeof exports === 'object') {
-        // Node
-        module.exports = factory();
-    } else if (typeof define === 'function' && define.amd) {
-        // AMD
-        define(factory);
-    } else {
-        // Browser globals
-        global.printStackTrace = factory();
-    }
-}(this, function() {
-    /**
-     * Main function giving a function stack trace with a forced or passed in Error
-     *
-     * @cfg {Error} e The error to create a stacktrace from (optional)
-     * @cfg {Boolean} guess If we should try to resolve the names of anonymous functions
-     * @return {Array} of Strings with functions, lines, files, and arguments where possible
-     */
-    function printStackTrace(options) {
-        options = options || {guess: true};
-        var ex = options.e || null, guess = !!options.guess;
-        var p = new printStackTrace.implementation(), result = p.run(ex);
-        return (guess) ? p.guessAnonymousFunctions(result) : result;
-    }
-
-    printStackTrace.implementation = function() {
-    };
-
-    printStackTrace.implementation.prototype = {
-        /**
-         * @param {Error} [ex] The error to create a stacktrace from (optional)
-         * @param {String} [mode] Forced mode (optional, mostly for unit tests)
-         */
-        run: function(ex, mode) {
-            ex = ex || this.createException();
-            mode = mode || this.mode(ex);
-            if (mode === 'other') {
-                return this.other(arguments.callee);
-            } else {
-                return this[mode](ex);
-            }
-        },
-
-        createException: function() {
-            try {
-                this.undef();
-            } catch (e) {
-                return e;
-            }
-        },
-
-        /**
-         * Mode could differ for different exception, e.g.
-         * exceptions in Chrome may or may not have arguments or stack.
-         *
-         * @return {String} mode of operation for the exception
-         */
-        mode: function(e) {
-            if (e['arguments'] && e.stack) {
-                return 'chrome';
-            }
-
-            if (e.stack && e.sourceURL) {
-                return 'safari';
-            }
-
-            if (e.stack && e.number) {
-                return 'ie';
-            }
-
-            if (e.stack && e.fileName) {
-                return 'firefox';
-            }
-
-            if (e.message && e['opera#sourceloc']) {
-                // e.message.indexOf("Backtrace:") > -1 -> opera9
-                // 'opera#sourceloc' in e -> opera9, opera10a
-                // !e.stacktrace -> opera9
-                if (!e.stacktrace) {
-                    return 'opera9'; // use e.message
-                }
-                if (e.message.indexOf('\n') > -1 && e.message.split('\n').length > e.stacktrace.split('\n').length) {
-                    // e.message may have more stack entries than e.stacktrace
-                    return 'opera9'; // use e.message
-                }
-                return 'opera10a'; // use e.stacktrace
-            }
-
-            if (e.message && e.stack && e.stacktrace) {
-                // e.stacktrace && e.stack -> opera10b
-                if (e.stacktrace.indexOf("called from line") < 0) {
-                    return 'opera10b'; // use e.stacktrace, format differs from 'opera10a'
-                }
-                // e.stacktrace && e.stack -> opera11
-                return 'opera11'; // use e.stacktrace, format differs from 'opera10a', 'opera10b'
-            }
-
-            if (e.stack && !e.fileName) {
-                // Chrome 27 does not have e.arguments as earlier versions,
-                // but still does not have e.fileName as Firefox
-                return 'chrome';
-            }
-
-            return 'other';
-        },
-
-        /**
-         * Given a context, function name, and callback function, overwrite it so that it calls
-         * printStackTrace() first with a callback and then runs the rest of the body.
-         *
-         * @param {Object} context of execution (e.g. window)
-         * @param {String} functionName to instrument
-         * @param {Function} callback function to call with a stack trace on invocation
-         */
-        instrumentFunction: function(context, functionName, callback) {
-            context = context || window;
-            var original = context[functionName];
-            context[functionName] = function instrumented() {
-                callback.call(this, printStackTrace().slice(4));
-                return context[functionName]._instrumented.apply(this, arguments);
-            };
-            context[functionName]._instrumented = original;
-        },
-
-        /**
-         * Given a context and function name of a function that has been
-         * instrumented, revert the function to it's original (non-instrumented)
-         * state.
-         *
-         * @param {Object} context of execution (e.g. window)
-         * @param {String} functionName to de-instrument
-         */
-        deinstrumentFunction: function(context, functionName) {
-            if (context[functionName].constructor === Function &&
-                context[functionName]._instrumented &&
-                context[functionName]._instrumented.constructor === Function) {
-                context[functionName] = context[functionName]._instrumented;
-            }
-        },
-
-        /**
-         * Given an Error object, return a formatted Array based on Chrome's stack string.
-         *
-         * @param e - Error object to inspect
-         * @return Array<String> of function calls, files and line numbers
-         */
-        chrome: function(e) {
-            return (e.stack + '\n')
-                .replace(/^[\s\S]+?\s+at\s+/, ' at ') // remove message
-                .replace(/^\s+(at eval )?at\s+/gm, '') // remove 'at' and indentation
-                .replace(/^([^\(]+?)([\n$])/gm, '{anonymous}() ($1)$2')
-                .replace(/^Object.<anonymous>\s*\(([^\)]+)\)/gm, '{anonymous}() ($1)')
-                .replace(/^(.+) \((.+)\)$/gm, '$1@$2')
-                .split('\n')
-                .slice(0, -1);
-        },
-
-        /**
-         * Given an Error object, return a formatted Array based on Safari's stack string.
-         *
-         * @param e - Error object to inspect
-         * @return Array<String> of function calls, files and line numbers
-         */
-        safari: function(e) {
-            return e.stack.replace(/\[native code\]\n/m, '')
-                .replace(/^(?=\w+Error\:).*$\n/m, '')
-                .replace(/^@/gm, '{anonymous}()@')
-                .split('\n');
-        },
-
-        /**
-         * Given an Error object, return a formatted Array based on IE's stack string.
-         *
-         * @param e - Error object to inspect
-         * @return Array<String> of function calls, files and line numbers
-         */
-        ie: function(e) {
-            return e.stack
-                .replace(/^\s*at\s+(.*)$/gm, '$1')
-                .replace(/^Anonymous function\s+/gm, '{anonymous}() ')
-                .replace(/^(.+)\s+\((.+)\)$/gm, '$1@$2')
-                .split('\n')
-                .slice(1);
-        },
-
-        /**
-         * Given an Error object, return a formatted Array based on Firefox's stack string.
-         *
-         * @param e - Error object to inspect
-         * @return Array<String> of function calls, files and line numbers
-         */
-        firefox: function(e) {
-            return e.stack.replace(/(?:\n@:0)?\s+$/m, '')
-                .replace(/^(?:\((\S*)\))?@/gm, '{anonymous}($1)@')
-                .split('\n');
-        },
-
-        opera11: function(e) {
-            var ANON = '{anonymous}', lineRE = /^.*line (\d+), column (\d+)(?: in (.+))? in (\S+):$/;
-            var lines = e.stacktrace.split('\n'), result = [];
-
-            for (var i = 0, len = lines.length; i < len; i += 2) {
-                var match = lineRE.exec(lines[i]);
-                if (match) {
-                    var location = match[4] + ':' + match[1] + ':' + match[2];
-                    var fnName = match[3] || "global code";
-                    fnName = fnName.replace(/<anonymous function: (\S+)>/, "$1").replace(/<anonymous function>/, ANON);
-                    result.push(fnName + '@' + location + ' -- ' + lines[i + 1].replace(/^\s+/, ''));
-                }
-            }
-
-            return result;
-        },
-
-        opera10b: function(e) {
-            // "<anonymous function: run>([arguments not available])@file://localhost/G:/js/stacktrace.js:27\n" +
-            // "printStackTrace([arguments not available])@file://localhost/G:/js/stacktrace.js:18\n" +
-            // "@file://localhost/G:/js/test/functional/testcase1.html:15"
-            var lineRE = /^(.*)@(.+):(\d+)$/;
-            var lines = e.stacktrace.split('\n'), result = [];
-
-            for (var i = 0, len = lines.length; i < len; i++) {
-                var match = lineRE.exec(lines[i]);
-                if (match) {
-                    var fnName = match[1] ? (match[1] + '()') : "global code";
-                    result.push(fnName + '@' + match[2] + ':' + match[3]);
-                }
-            }
-
-            return result;
-        },
-
-        /**
-         * Given an Error object, return a formatted Array based on Opera 10's stacktrace string.
-         *
-         * @param e - Error object to inspect
-         * @return Array<String> of function calls, files and line numbers
-         */
-        opera10a: function(e) {
-            // "  Line 27 of linked script file://localhost/G:/js/stacktrace.js\n"
-            // "  Line 11 of inline#1 script in file://localhost/G:/js/test/functional/testcase1.html: In function foo\n"
-            var ANON = '{anonymous}', lineRE = /Line (\d+).*script (?:in )?(\S+)(?:: In function (\S+))?$/i;
-            var lines = e.stacktrace.split('\n'), result = [];
-
-            for (var i = 0, len = lines.length; i < len; i += 2) {
-                var match = lineRE.exec(lines[i]);
-                if (match) {
-                    var fnName = match[3] || ANON;
-                    result.push(fnName + '()@' + match[2] + ':' + match[1] + ' -- ' + lines[i + 1].replace(/^\s+/, ''));
-                }
-            }
-
-            return result;
-        },
-
-        // Opera 7.x-9.2x only!
-        opera9: function(e) {
-            // "  Line 43 of linked script file://localhost/G:/js/stacktrace.js\n"
-            // "  Line 7 of inline#1 script in file://localhost/G:/js/test/functional/testcase1.html\n"
-            var ANON = '{anonymous}', lineRE = /Line (\d+).*script (?:in )?(\S+)/i;
-            var lines = e.message.split('\n'), result = [];
-
-            for (var i = 2, len = lines.length; i < len; i += 2) {
-                var match = lineRE.exec(lines[i]);
-                if (match) {
-                    result.push(ANON + '()@' + match[2] + ':' + match[1] + ' -- ' + lines[i + 1].replace(/^\s+/, ''));
-                }
-            }
-
-            return result;
-        },
-
-        // Safari 5-, IE 9-, and others
-        other: function(curr) {
-            var ANON = '{anonymous}', fnRE = /function(?:\s+([\w$]+))?\s*\(/, stack = [], fn, args, maxStackSize = 10;
-            var slice = Array.prototype.slice;
-            while (curr && stack.length < maxStackSize) {
-                fn = fnRE.test(curr.toString()) ? RegExp.$1 || ANON : ANON;
-                try {
-                    args = slice.call(curr['arguments'] || []);
-                } catch (e) {
-                    args = ['Cannot access arguments: ' + e];
-                }
-                stack[stack.length] = fn + '(' + this.stringifyArguments(args) + ')';
-                try {
-                    curr = curr.caller;
-                } catch (e) {
-                    stack[stack.length] = 'Cannot access caller: ' + e;
-                    break;
-                }
-            }
-            return stack;
-        },
-
-        /**
-         * Given arguments array as a String, substituting type names for non-string types.
-         *
-         * @param {Arguments,Array} args
-         * @return {String} stringified arguments
-         */
-        stringifyArguments: function(args) {
-            var result = [];
-            var slice = Array.prototype.slice;
-            for (var i = 0; i < args.length; ++i) {
-                var arg = args[i];
-                if (arg === undefined) {
-                    result[i] = 'undefined';
-                } else if (arg === null) {
-                    result[i] = 'null';
-                } else if (arg.constructor) {
-                    // TODO constructor comparison does not work for iframes
-                    if (arg.constructor === Array) {
-                        if (arg.length < 3) {
-                            result[i] = '[' + this.stringifyArguments(arg) + ']';
-                        } else {
-                            result[i] = '[' + this.stringifyArguments(slice.call(arg, 0, 1)) + '...' + this.stringifyArguments(slice.call(arg, -1)) + ']';
-                        }
-                    } else if (arg.constructor === Object) {
-                        result[i] = '#object';
-                    } else if (arg.constructor === Function) {
-                        result[i] = '#function';
-                    } else if (arg.constructor === String) {
-                        result[i] = '"' + arg + '"';
-                    } else if (arg.constructor === Number) {
-                        result[i] = arg;
-                    } else {
-                        result[i] = '?';
-                    }
-                }
-            }
-            return result.join(',');
-        },
-
-        sourceCache: {},
-
-        /**
-         * @return {String} the text from a given URL
-         */
-        ajax: function(url) {
-            var req = this.createXMLHTTPObject();
-            if (req) {
-                try {
-                    req.open('GET', url, false);
-                    //req.overrideMimeType('text/plain');
-                    //req.overrideMimeType('text/javascript');
-                    req.send(null);
-                    //return req.status == 200 ? req.responseText : '';
-                    return req.responseText;
-                } catch (e) {
-                }
-            }
-            return '';
-        },
-
-        /**
-         * Try XHR methods in order and store XHR factory.
-         *
-         * @return {XMLHttpRequest} XHR function or equivalent
-         */
-        createXMLHTTPObject: function() {
-            var xmlhttp, XMLHttpFactories = [
-                function() {
-                    return new XMLHttpRequest();
-                }, function() {
-                    return new ActiveXObject('Msxml2.XMLHTTP');
-                }, function() {
-                    return new ActiveXObject('Msxml3.XMLHTTP');
-                }, function() {
-                    return new ActiveXObject('Microsoft.XMLHTTP');
-                }
-            ];
-            for (var i = 0; i < XMLHttpFactories.length; i++) {
-                try {
-                    xmlhttp = XMLHttpFactories[i]();
-                    // Use memoization to cache the factory
-                    this.createXMLHTTPObject = XMLHttpFactories[i];
-                    return xmlhttp;
-                } catch (e) {
-                }
-            }
-        },
-
-        /**
-         * Given a URL, check if it is in the same domain (so we can get the source
-         * via Ajax).
-         *
-         * @param url {String} source url
-         * @return {Boolean} False if we need a cross-domain request
-         */
-        isSameDomain: function(url) {
-            return typeof location !== "undefined" && url.indexOf(location.hostname) !== -1; // location may not be defined, e.g. when running from nodejs.
-        },
-
-        /**
-         * Get source code from given URL if in the same domain.
-         *
-         * @param url {String} JS source URL
-         * @return {Array} Array of source code lines
-         */
-        getSource: function(url) {
-            // TODO reuse source from script tags?
-            if (!(url in this.sourceCache)) {
-                this.sourceCache[url] = this.ajax(url).split('\n');
-            }
-            return this.sourceCache[url];
-        },
-
-        guessAnonymousFunctions: function(stack) {
-            for (var i = 0; i < stack.length; ++i) {
-                var reStack = /\{anonymous\}\(.*\)@(.*)/,
-                    reRef = /^(.*?)(?::(\d+))(?::(\d+))?(?: -- .+)?$/,
-                    frame = stack[i], ref = reStack.exec(frame);
-
-                if (ref) {
-                    var m = reRef.exec(ref[1]);
-                    if (m) { // If falsey, we did not get any file/line information
-                        var file = m[1], lineno = m[2], charno = m[3] || 0;
-                        if (file && this.isSameDomain(file) && lineno) {
-                            var functionName = this.guessAnonymousFunction(file, lineno, charno);
-                            stack[i] = frame.replace('{anonymous}', functionName);
-                        }
-                    }
-                }
-            }
-            return stack;
-        },
-
-        guessAnonymousFunction: function(url, lineNo, charNo) {
-            var ret;
-            try {
-                ret = this.findFunctionName(this.getSource(url), lineNo);
-            } catch (e) {
-                ret = 'getSource failed with url: ' + url + ', exception: ' + e.toString();
-            }
-            return ret;
-        },
-
-        findFunctionName: function(source, lineNo) {
-            // FIXME findFunctionName fails for compressed source
-            // (more than one function on the same line)
-            // function {name}({args}) m[1]=name m[2]=args
-            var reFunctionDeclaration = /function\s+([^(]*?)\s*\(([^)]*)\)/;
-            // {name} = function ({args}) TODO args capture
-            // /['"]?([0-9A-Za-z_]+)['"]?\s*[:=]\s*function(?:[^(]*)/
-            var reFunctionExpression = /['"]?([$_A-Za-z][$_A-Za-z0-9]*)['"]?\s*[:=]\s*function\b/;
-            // {name} = eval()
-            var reFunctionEvaluation = /['"]?([$_A-Za-z][$_A-Za-z0-9]*)['"]?\s*[:=]\s*(?:eval|new Function)\b/;
-            // Walk backwards in the source lines until we find
-            // the line which matches one of the patterns above
-            var code = "", line, maxLines = Math.min(lineNo, 20), m, commentPos;
-            for (var i = 0; i < maxLines; ++i) {
-                // lineNo is 1-based, source[] is 0-based
-                line = source[lineNo - i - 1];
-                commentPos = line.indexOf('//');
-                if (commentPos >= 0) {
-                    line = line.substr(0, commentPos);
-                }
-                // TODO check other types of comments? Commented code may lead to false positive
-                if (line) {
-                    code = line + code;
-                    m = reFunctionExpression.exec(code);
-                    if (m && m[1]) {
-                        return m[1];
-                    }
-                    m = reFunctionDeclaration.exec(code);
-                    if (m && m[1]) {
-                        //return m[1] + "(" + (m[2] || "") + ")";
-                        return m[1];
-                    }
-                    m = reFunctionEvaluation.exec(code);
-                    if (m && m[1]) {
-                        return m[1];
-                    }
-                }
-            }
-            return '(?)';
-        }
-    };
-
-    return printStackTrace;
-}));