Merge branch 'master' of github.com:gskinner/regexr

Author: gskinner

index.html

@@ -35,12 +35,14 @@
 	<script src="js/third-party/classList.js"></script>
 	<script src="js/third-party/store.js"></script>
 	<script src="js/third-party/placeholders.min.js"></script>
-	<script src="js/Tracking.js"></script>
-	<script src="js/BrowserHistory.js"></script>
+	<script src="js/third-party/history.adapter.native.js"></script>
+	<script src="js/third-party/history.js"></script>
 	<script src="js/events/Event.js"></script>
 	<script src="js/events/EventDispatcher.js"></script>
-	<script src="js/events/DataEvent.js"></script>
 	<script src="js/utils/Utils.js"></script>
+	<script src="js/Tracking.js"></script>
+	<script src="js/BrowserHistory.js"></script>
+	<script src="js/events/DataEvent.js"></script>
 	<script src="js/events/TransitionEvents.js"></script>
 	<script src="js/Settings.js"></script>
 	<script src="js/controls/Rating.js"></script>

js/BrowserHistory.js

@@ -24,21 +24,51 @@ SOFTWARE.
 (function () {
 	var s = {};
 
+	createjs.EventDispatcher.initialize(s);
 // public properties:
 
 // private properties:
 	s._currentPath = null;
+	s._currentLocation = null;
 
 // public methods:
 	s.go = function (url) {
 		if (s._currentPath === url) { return; }
 		s._currentPath = url;
 
 		if (window.history.pushState) {
-			window.history.pushState(null, null, url || "/");
+			History.pushState(null, null, url || "/");
 		} else {
 			window.location.hash = url || "";
 		}
+
+		s._currentLocation = document.location.toString();
+	};
+
+	s.init = function() {
+		History.init();
+
+		// Use history.js for modern browsers
+		if (window.history.pushState) {
+			History.Adapter.bind(window, 'statechange', $.bind(s, s.handleHistoryChange));
+		} else {
+			// Custom support for #tags (for ie9)
+			window.addEventListener("hashchange", $.bind(s, s.handleHashChange));
+		}
+	};
+
+	s.handleHistoryChange = function(evt) {
+		s.dispatchEvent("change");
+	};
+
+	s.handleHashChange = function(evt) {
+		var path = document.location.hash.substr(1);
+		if (s._currentPath === path) {
+			return;
+		}
+		s._currentPath = path;
+
+		s.dispatchEvent("change");
 	};
 
 // private methods:

js/controls/List.js

@@ -206,6 +206,15 @@ SOFTWARE.
 		return this.data[idx];
 	};
 
+	p.findIndexByValue = function(key, value) {
+		for (var i=0;i<this.data.length;i++) {
+			if (this.data[i][key] == value) {
+				return i;
+			}
+		}
+		return -1;
+	};
+
 	p.handleEvent = function(evt) {
 		this.triggerChange(evt.currentTarget.index);
 	};

js/index.template.js

@@ -33,14 +33,18 @@ SOFTWARE.
 	};
 	var p = s.prototype = {};
 	p._ctaAnimation = null;
+	p.docView = null;
 
 	p.init = function () {
-	
+
 		// If the browser is not supported, don't let them in.
 		if (!$.isSupported()) {
 			return;
 		}
 
+		BrowserHistory.init();
+		BrowserHistory.on("change", this.handleHistoryChange, this);
+
 		if (document.location.host != "regexr.com" && document.location.host != "www.regexr.com") {
 			$.removeClass($.el(".beta-banner"), "hidden");
 		}
@@ -58,11 +62,12 @@ SOFTWARE.
 		List.spinner = $.el(".spinner");
 
 		var docView = new DocView($.el("#docview"));
+		this.docView = docView;
 		var def = $.el("#docview .default");
 		DocView.DEFAULT_TEXT = (def.textContent || def.innerText).trim().replace("{{ctrl}}", Utils.getCtrlKey().toLowerCase());
 		docView.setText(); // need to do this as well as the defer below, to keep the history clean.
 		$.defer(docView, docView.setText); // this fixes an issue with CodeMirror returning bad char positions at specific widths.
-		
+
 		def.style.display = "none";
 
 		docView.setExpression(DocView.DEFAULT_EXPRESSION).setSubstitution(DocView.DEFAULT_SUBSTITUTION);
@@ -112,7 +117,14 @@ SOFTWARE.
 
 		Settings.trackVisit();
 		Settings.cleanSaveTokens();
+		this.navigate();
+	};
 
+	p.handleHistoryChange = function(evt) {
+		this.navigate();
+	};
+
+	p.navigate = function() {
 		// Check for a deep-link
 		var url = document.location.toString();
 		var match = /[\/#\?]([\w\d]+)$/ig.exec(url);
@@ -121,11 +133,14 @@ SOFTWARE.
 			id = match[1];
 		}
 
+		if (ExpressionModel.id == $.idToNumber(id)+'') { return; }
+
 		if ($.isIDValid(id)) {
+			var _this = this;
 			ServerModel.getPatternByID(id).then(function (data) {
 				ExpressionModel.setLastSave(data);
 				var pattern = $.parsePattern(data.pattern);
-				docView.populateAll(pattern.ex, pattern.flags, data.content, data.replace);
+				_this.docView.populateAll(pattern.ex, pattern.flags, data.content, data.replace);
 			}, function () {
 				BrowserHistory.go();
 			});

js/net/ExpressionModel.js

@@ -25,6 +25,8 @@ SOFTWARE.
 	"use strict";
 
 	var s = {};
+	createjs.EventDispatcher.initialize(s);
+
 	s.docView = null;
 	s.id = null;
 	s._lastSave = null;
@@ -76,6 +78,7 @@ SOFTWARE.
 
 		s.id = id;
 		s._lastSave = pattern;
+		s.dispatchEvent("change");
 
 		return result;
 	};
@@ -85,10 +88,13 @@ SOFTWARE.
 	};
 
 	s.setLastSave = function(value) {
+		if (s.id == value.id) { return; }
+
 		s.id = value.id;
 		if (Settings.getUpdateToken(s.id)) {
 			s._lastSave = value;
 		}
+		s.dispatchEvent("change");
 	};
 
 	s.getLastSave = function() {
@@ -98,6 +104,13 @@ SOFTWARE.
 		return s._lastSave;
 	};
 
+	s.setID = function(value) {
+		if (s.id == value) { return; }
+
+		s.id = value;
+		s.dispatchEvent("change");
+	}
+
 	scope.ExpressionModel = s;
 
 }(window));

js/third-party/history.adapter.native.js

@@ -0,0 +1,121 @@
+/**
+ * History.js Native Adapter
+ * @author Benjamin Arthur Lupton <[email protected]>
+ * @copyright 2010-2011 Benjamin Arthur Lupton <[email protected]>
+ * @license New BSD License <http://creativecommons.org/licenses/BSD/>
+ */
+
+// Closure
+(function(window,undefined){
+	"use strict";
+
+	// Localise Globals
+	var History = window.History = window.History||{};
+
+	// Check Existence
+	if ( typeof History.Adapter !== 'undefined' ) {
+		throw new Error('History.js Adapter has already been loaded...');
+	}
+
+	// Add the Adapter
+	History.Adapter = {
+		/**
+		 * History.Adapter.handlers[uid][eventName] = Array
+		 */
+		handlers: {},
+
+		/**
+		 * History.Adapter._uid
+		 * The current element unique identifier
+		 */
+		_uid: 1,
+
+		/**
+		 * History.Adapter.uid(element)
+		 * @param {Element} element
+		 * @return {String} uid
+		 */
+		uid: function(element){
+			return element._uid || (element._uid = History.Adapter._uid++);
+		},
+
+		/**
+		 * History.Adapter.bind(el,event,callback)
+		 * @param {Element} element
+		 * @param {String} eventName - custom and standard events
+		 * @param {Function} callback
+		 * @return
+		 */
+		bind: function(element,eventName,callback){
+			// Prepare
+			var uid = History.Adapter.uid(element);
+
+			// Apply Listener
+			History.Adapter.handlers[uid] = History.Adapter.handlers[uid] || {};
+			History.Adapter.handlers[uid][eventName] = History.Adapter.handlers[uid][eventName] || [];
+			History.Adapter.handlers[uid][eventName].push(callback);
+
+			// Bind Global Listener
+			element['on'+eventName] = (function(element,eventName){
+				return function(event){
+					History.Adapter.trigger(element,eventName,event);
+				};
+			})(element,eventName);
+		},
+
+		/**
+		 * History.Adapter.trigger(el,event)
+		 * @param {Element} element
+		 * @param {String} eventName - custom and standard events
+		 * @param {Object} event - a object of event data
+		 * @return
+		 */
+		trigger: function(element,eventName,event){
+			// Prepare
+			event = event || {};
+			var uid = History.Adapter.uid(element),
+				i,n;
+
+			// Apply Listener
+			History.Adapter.handlers[uid] = History.Adapter.handlers[uid] || {};
+			History.Adapter.handlers[uid][eventName] = History.Adapter.handlers[uid][eventName] || [];
+
+			// Fire Listeners
+			for ( i=0,n=History.Adapter.handlers[uid][eventName].length; i<n; ++i ) {
+				History.Adapter.handlers[uid][eventName][i].apply(this,[event]);
+			}
+		},
+
+		/**
+		 * History.Adapter.extractEventData(key,event,extra)
+		 * @param {String} key - key for the event data to extract
+		 * @param {String} event - custom and standard events
+		 * @return {mixed}
+		 */
+		extractEventData: function(key,event){
+			var result = (event && event[key]) || undefined;
+			return result;
+		},
+
+		/**
+		 * History.Adapter.onDomLoad(callback)
+		 * @param {Function} callback
+		 * @return
+		 */
+		onDomLoad: function(callback) {
+			var timeout = window.setTimeout(function(){
+				callback();
+			},2000);
+			window.onload = function(){
+				clearTimeout(timeout);
+				callback();
+			};
+		}
+	};
+
+	// Try to Initialise History
+	if ( typeof History.init !== 'undefined' ) {
+		History.init();
+	}
+
+})(window);