eliminate Cropper conflicts with jQuery

library/cropper/cropper.html

@@ -40,17 +40,17 @@ JavaScript:
    1.
       function onEndCrop( coords, dimensions ) {
    2.
-          $( 'x1' ).value = coords.x1;
+          $PR( 'x1' ).value = coords.x1;
    3.
-          $( 'y1' ).value = coords.y1;
+          $PR( 'y1' ).value = coords.y1;
    4.
-          $( 'x2' ).value = coords.x2;
+          $PR( 'x2' ).value = coords.x2;
    5.
-          $( 'y2' ).value = coords.y2;
+          $PR( 'y2' ).value = coords.y2;
    6.
-          $( 'width' ).value = dimensions.width;
+          $PR( 'width' ).value = dimensions.width;
    7.
-          $( 'height' ).value = dimensions.height;
+          $PR( 'height' ).value = dimensions.height;
    8.
       }
 

library/cropper/cropper.uncompressed.js

@@ -113,6 +113,8 @@
  * http://www.opensource.org/licenses/bsd-license.php
  * 
  * See scriptaculous.js for full scriptaculous licence
+ *
+ * Modified 2013/06/01 Zach P to change $() to $PR() for eliminating conflicts with jQuery
  */
  
 /**
@@ -134,7 +136,7 @@ Object.extend( Object.extend( CropDraggable.prototype, Draggable.prototype), {
 			arguments[1] || {}
 		);
 
-		this.element = $(element);
+		this.element = $PR(element);
 
 		this.handle = this.element;
 
@@ -212,12 +214,12 @@ Object.extend( Object.extend( CropDraggable.prototype, Draggable.prototype), {
  *
  * 		Example:
  * 			function onEndCrop( coords, dimensions ) {
- *				$( 'x1' ).value 	= coords.x1;
+ *				$PR( 'x1' ).value 	= coords.x1;
- *				$( 'y1' ).value 	= coords.y1;
+ *				$PR( 'y1' ).value 	= coords.y1;
- *				$( 'x2' ).value 	= coords.x2;
+ *				$PR( 'x2' ).value 	= coords.x2;
- *				$( 'y2' ).value 	= coords.y2;
+ *				$PR( 'y2' ).value 	= coords.y2;
- *				$( 'width' ).value 	= dimensions.width;
+ *				$PR( 'width' ).value 	= dimensions.width;
- *				$( 'height' ).value	= dimensions.height;
+ *				$PR( 'height' ).value	= dimensions.height;
  *			}
  * 
  */
@@ -288,7 +290,7 @@ Cropper.Img.prototype = {
 		 * @var obj
 		 * The img node to attach to
 		 */
-		this.img			= $( element );
+		this.img			= $PR( element );
 		/**
 		 * @var obj
 		 * The x & y coordinates of the click point
@@ -524,7 +526,7 @@ Cropper.Img.prototype = {
 	 */
 	registerHandles: function( registration ) {	
 		for( var i = 0; i < this.handles.length; i++ ) {
-			var handle = $( this.handles[i] );
+			var handle = $PR( this.handles[i] );
 			
 			if( registration ) {
 				var hideHandle	= false;	// whether to hide the handle
@@ -569,16 +571,16 @@ Cropper.Img.prototype = {
 		 */
 		this.imgH = this.img.height;			
 
-		$( this.north ).setStyle( { height: 0 } );
+		$PR( this.north ).setStyle( { height: 0 } );
-		$( this.east ).setStyle( { width: 0, height: 0 } );
+		$PR( this.east ).setStyle( { width: 0, height: 0 } );
-		$( this.south ).setStyle( { height: 0 } );
+		$PR( this.south ).setStyle( { height: 0 } );
-		$( this.west ).setStyle( { width: 0, height: 0 } );
+		$PR( this.west ).setStyle( { width: 0, height: 0 } );
 		
 		// resize the container to fit the image
-		$( this.imgWrap ).setStyle( { 'width': this.imgW + 'px', 'height': this.imgH + 'px' } );
+		$PR( this.imgWrap ).setStyle( { 'width': this.imgW + 'px', 'height': this.imgH + 'px' } );
 		
 		// hide the select area
-		$( this.selArea ).hide();
+		$PR( this.selArea ).hide();
 						
 		// setup the starting position of the select area
 		var startCoords = { x1: 0, y1: 0, x2: 0, y2: 0 };
@@ -1263,7 +1265,7 @@ Object.extend( Object.extend( Cropper.ImgWithPreview.prototype, Cropper.Img.prot
 			 * The preview image wrapper element
 			 * @var obj HTML element
 			 */
-			this.previewWrap 	= $( this.options.previewWrap );
+			this.previewWrap 	= $PR( this.options.previewWrap );
 			/**
 			 * The preview image element
 			 * @var obj HTML IMG element

library/cropper/lib/controls.js

@@ -37,8 +37,8 @@ var Autocompleter = {}
 Autocompleter.Base = function() {};
 Autocompleter.Base.prototype = {
   baseInitialize: function(element, update, options) {
-    this.element     = $(element); 
+    this.element     = $PR(element); 
-    this.update      = $(update);  
+    this.update      = $PR(update);  
     this.hasFocus    = false; 
     this.changed     = false; 
     this.active      = false; 
@@ -88,7 +88,7 @@ Autocompleter.Base.prototype = {
        '<iframe id="' + this.update.id + '_iefix" '+
        'style="display:none;position:absolute;filter:progid:DXImageTransform.Microsoft.Alpha(opacity=0);" ' +
        'src="javascript:false;" frameborder="0" scrolling="no"></iframe>');
-      this.iefix = $(this.update.id+'_iefix');
+      this.iefix = $PR(this.update.id+'_iefix');
     }
     if(this.iefix) setTimeout(this.fixIEOverlapping.bind(this), 50);
   },
@@ -456,7 +456,7 @@ Ajax.InPlaceEditor.defaultHighlightColor = "#FFFF99";
 Ajax.InPlaceEditor.prototype = {
   initialize: function(element, url, options) {
     this.url = url;
-    this.element = $(element);
+    this.element = $PR(element);
 
     this.options = Object.extend({
       okButton: true,
@@ -491,14 +491,14 @@ Ajax.InPlaceEditor.prototype = {
 
     if(!this.options.formId && this.element.id) {
       this.options.formId = this.element.id + "-inplaceeditor";
-      if ($(this.options.formId)) {
+      if ($PR(this.options.formId)) {
         // there's already a form with that name, don't specify an id
         this.options.formId = null;
       }
     }
     
     if (this.options.externalControl) {
-      this.options.externalControl = $(this.options.externalControl);
+      this.options.externalControl = $PR(this.options.externalControl);
     }
     
     this.originalBackground = Element.getStyle(this.element, 'background-color');
@@ -796,7 +796,7 @@ Form.Element.DelayedObserver = Class.create();
 Form.Element.DelayedObserver.prototype = {
   initialize: function(element, delay, callback) {
     this.delay     = delay || 0.5;
-    this.element   = $(element);
+    this.element   = $PR(element);
     this.callback  = callback;
     this.timer     = null;
     this.lastValue = $F(this.element); 

library/cropper/lib/dragdrop.js

@@ -9,11 +9,11 @@ var Droppables = {
   drops: [],
 
   remove: function(element) {
-    this.drops = this.drops.reject(function(d) { return d.element==$(element) });
+    this.drops = this.drops.reject(function(d) { return d.element==$PR(element) });
   },
 
   add: function(element) {
-    element = $(element);
+    element = $PR(element);
     var options = Object.extend({
       greedy:     true,
       hoverclass: null,
@@ -26,9 +26,9 @@ var Droppables = {
       var containment = options.containment;
       if((typeof containment == 'object') && 
         (containment.constructor == Array)) {
-        containment.each( function(c) { options._containers.push($(c)) });
+        containment.each( function(c) { options._containers.push($PR(c)) });
       } else {
-        options._containers.push($(containment));
+        options._containers.push($PR(containment));
       }
     }
     
@@ -228,17 +228,17 @@ Draggable.prototype = {
       snap: false   // false, or xy or [x,y] or function(x,y){ return [x,y] }
     }, arguments[1] || {});
 
-    this.element = $(element);
+    this.element = $PR(element);
     
     if(options.handle && (typeof options.handle == 'string')) {
       var h = Element.childrenWithClassName(this.element, options.handle, true);
       if(h.length>0) this.handle = h[0];
     }
-    if(!this.handle) this.handle = $(options.handle);
+    if(!this.handle) this.handle = $PR(options.handle);
     if(!this.handle) this.handle = this.element;
     
     if(options.scroll && !options.scroll.scrollTo && !options.scroll.outerHTML)
-      options.scroll = $(options.scroll);
+      options.scroll = $PR(options.scroll);
 
     Element.makePositioned(this.element); // fix IE    
 
@@ -508,7 +508,7 @@ Draggable.prototype = {
 var SortableObserver = Class.create();
 SortableObserver.prototype = {
   initialize: function(element, observer) {
-    this.element   = $(element);
+    this.element   = $PR(element);
     this.observer  = observer;
     this.lastValue = Sortable.serialize(this.element);
   },
@@ -535,7 +535,7 @@ var Sortable = {
   },
 
   options: function(element) {
-    element = Sortable._findRootElement($(element));
+    element = Sortable._findRootElement($PR(element));
     if(!element) return;
     return Sortable.sortables[element.id];
   },
@@ -553,7 +553,7 @@ var Sortable = {
   },
 
   create: function(element) {
-    element = $(element);
+    element = $PR(element);
     var options = Object.extend({ 
       element:     element,
       tag:         'li',       // assumes li children, override with tag: 'tagname'
@@ -744,7 +744,7 @@ var Sortable = {
     if(sortable && !sortable.ghosting) return; 
 
     if(!Sortable._marker) {
-      Sortable._marker = $('dropmarker') || document.createElement('DIV');
+      Sortable._marker = $PR('dropmarker') || document.createElement('DIV');
       Element.hide(Sortable._marker);
       Element.addClassName(Sortable._marker, 'dropmarker');
       Sortable._marker.style.position = 'absolute';
@@ -802,7 +802,7 @@ var Sortable = {
   },
 
   tree: function(element) {
-    element = $(element);
+    element = $PR(element);
     var sortableOptions = this.options(element);
     var options = Object.extend({
       tag: sortableOptions.tag,
@@ -833,16 +833,16 @@ var Sortable = {
   },
 
   sequence: function(element) {
-    element = $(element);
+    element = $PR(element);
     var options = Object.extend(this.options(element), arguments[1] || {});
     
-    return $(this.findElements(element, options) || []).map( function(item) {
+    return $PR(this.findElements(element, options) || []).map( function(item) {
       return item.id.match(options.format) ? item.id.match(options.format)[1] : '';
     });
   },
 
   setSequence: function(element, new_sequence) {
-    element = $(element);
+    element = $PR(element);
     var options = Object.extend(this.options(element), arguments[2] || {});
     
     var nodeMap = {};
@@ -862,7 +862,7 @@ var Sortable = {
   },
   
   serialize: function(element) {
-    element = $(element);
+    element = $PR(element);
     var options = Object.extend(Sortable.options(element), arguments[1] || {});
     var name = encodeURIComponent(
       (arguments[1] && arguments[1].name) ? arguments[1].name : element.id);
@@ -912,4 +912,4 @@ Element.offsetSize = function (element, type) {
     return element.offsetHeight;
   else
     return element.offsetWidth;
-}
+}

library/cropper/lib/effects.js

@@ -25,14 +25,14 @@ String.prototype.parseColor = function() {
 /*--------------------------------------------------------------------------*/
 
 Element.collectTextNodes = function(element) {  
-  return $A($(element).childNodes).collect( function(node) {
+  return $A($PR(element).childNodes).collect( function(node) {
     return (node.nodeType==3 ? node.nodeValue : 
       (node.hasChildNodes() ? Element.collectTextNodes(node) : ''));
   }).flatten().join('');
 }
 
 Element.collectTextNodesIgnoreClass = function(element, className) {  
-  return $A($(element).childNodes).collect( function(node) {
+  return $A($PR(element).childNodes).collect( function(node) {
     return (node.nodeType==3 ? node.nodeValue : 
       ((node.hasChildNodes() && !Element.hasClassName(node,className)) ? 
         Element.collectTextNodesIgnoreClass(node, className) : ''));
@@ -40,7 +40,7 @@ Element.collectTextNodesIgnoreClass = function(element, className) {
 }
 
 Element.setContentZoom = function(element, percent) {
-  element = $(element);  
+  element = $PR(element);  
   Element.setStyle(element, {fontSize: (percent/100) + 'em'});   
   if(navigator.appVersion.indexOf('AppleWebKit')>0) window.scrollBy(0,0);
 }
@@ -55,7 +55,7 @@ Element.getOpacity = function(element){
 }
 
 Element.setOpacity = function(element, value){  
-  element= $(element);  
+  element= $PR(element);  
   if (value == 1){
     Element.setStyle(element, { opacity: 
       (/Gecko/.test(navigator.userAgent) && !/Konqueror|Safari|KHTML/.test(navigator.userAgent)) ? 
@@ -73,12 +73,12 @@ Element.setOpacity = function(element, value){
 }  
  
 Element.getInlineOpacity = function(element){  
-  return $(element).style.opacity || '';
+  return $PR(element).style.opacity || '';
 }  
 
 Element.childrenWithClassName = function(element, className, findFirst) {
   var classNameRegExp = new RegExp("(^|\\s)" + className + "(\\s|$)");
-  var results = $A($(element).getElementsByTagName('*'))[findFirst ? 'detect' : 'select']( function(c) { 
+  var results = $A($PR(element).getElementsByTagName('*'))[findFirst ? 'detect' : 'select']( function(c) { 
     return (c.className && c.className.match(classNameRegExp));
   });
   if(!results) results = [];
@@ -87,7 +87,7 @@ Element.childrenWithClassName = function(element, className, findFirst) {
 
 Element.forceRerendering = function(element) {
   try {
-    element = $(element);
+    element = $PR(element);
     var n = document.createTextNode(' ');
     element.appendChild(n);
     element.removeChild(n);
@@ -107,7 +107,7 @@ var Effect = {
   tagifyText: function(element) {
     var tagifyStyle = 'position:relative';
     if(/MSIE/.test(navigator.userAgent)) tagifyStyle += ';zoom:1';
-    element = $(element);
+    element = $PR(element);
     $A(element.childNodes).each( function(child) {
       if(child.nodeType==3) {
         child.nodeValue.toArray().each( function(character) {
@@ -127,7 +127,7 @@ var Effect = {
        (element.length))
       elements = element;
     else
-      elements = $(element).childNodes;
+      elements = $PR(element).childNodes;
       
     var options = Object.extend({
       speed: 0.1,
@@ -145,7 +145,7 @@ var Effect = {
     'appear': ['Appear','Fade']
   },
   toggle: function(element, effect) {
-    element = $(element);
+    element = $PR(element);
     effect = (effect || 'appear').toLowerCase();
     var options = Object.extend({
       queue: { position:'end', scope:(element.id || 'global'), limit: 1 }
@@ -351,7 +351,7 @@ Object.extend(Object.extend(Effect.Parallel.prototype, Effect.Base.prototype), {
 Effect.Opacity = Class.create();
 Object.extend(Object.extend(Effect.Opacity.prototype, Effect.Base.prototype), {
   initialize: function(element) {
-    this.element = $(element);
+    this.element = $PR(element);
     // make this work on IE on elements without 'layout'
     if(/MSIE/.test(navigator.userAgent) && (!this.element.hasLayout))
       this.element.setStyle({zoom: 1});
@@ -369,7 +369,7 @@ Object.extend(Object.extend(Effect.Opacity.prototype, Effect.Base.prototype), {
 Effect.Move = Class.create();
 Object.extend(Object.extend(Effect.Move.prototype, Effect.Base.prototype), {
   initialize: function(element) {
-    this.element = $(element);
+    this.element = $PR(element);
     var options = Object.extend({
       x:    0,
       y:    0,
@@ -408,7 +408,7 @@ Effect.MoveBy = function(element, toTop, toLeft) {
 Effect.Scale = Class.create();
 Object.extend(Object.extend(Effect.Scale.prototype, Effect.Base.prototype), {
   initialize: function(element, percent) {
-    this.element = $(element)
+    this.element = $PR(element)
     var options = Object.extend({
       scaleX: true,
       scaleY: true,
@@ -482,7 +482,7 @@ Object.extend(Object.extend(Effect.Scale.prototype, Effect.Base.prototype), {
 Effect.Highlight = Class.create();
 Object.extend(Object.extend(Effect.Highlight.prototype, Effect.Base.prototype), {
   initialize: function(element) {
-    this.element = $(element);
+    this.element = $PR(element);
     var options = Object.extend({ startcolor: '#ffff99' }, arguments[1] || {});
     this.start(options);
   },
@@ -515,7 +515,7 @@ Object.extend(Object.extend(Effect.Highlight.prototype, Effect.Base.prototype),
 Effect.ScrollTo = Class.create();
 Object.extend(Object.extend(Effect.ScrollTo.prototype, Effect.Base.prototype), {
   initialize: function(element) {
-    this.element = $(element);
+    this.element = $PR(element);
     this.start(arguments[1] || {});
   },
   setup: function() {
@@ -540,7 +540,7 @@ Object.extend(Object.extend(Effect.ScrollTo.prototype, Effect.Base.prototype), {
 /* ------------- combination effects ------------- */
 
 Effect.Fade = function(element) {
-  element = $(element);
+  element = $PR(element);
   var oldOpacity = element.getInlineOpacity();
   var options = Object.extend({
   from: element.getOpacity() || 1.0,
@@ -554,7 +554,7 @@ Effect.Fade = function(element) {
 }
 
 Effect.Appear = function(element) {
-  element = $(element);
+  element = $PR(element);
   var options = Object.extend({
   from: (element.getStyle('display') == 'none' ? 0.0 : element.getOpacity() || 0.0),
   to:   1.0,
@@ -570,7 +570,7 @@ Effect.Appear = function(element) {
 }
 
 Effect.Puff = function(element) {
-  element = $(element);
+  element = $PR(element);
   var oldStyle = { opacity: element.getInlineOpacity(), position: element.getStyle('position') };
   return new Effect.Parallel(
    [ new Effect.Scale(element, 200, 
@@ -587,7 +587,7 @@ Effect.Puff = function(element) {
 }
 
 Effect.BlindUp = function(element) {
-  element = $(element);
+  element = $PR(element);
   element.makeClipping();
   return new Effect.Scale(element, 0, 
     Object.extend({ scaleContent: false, 
@@ -602,7 +602,7 @@ Effect.BlindUp = function(element) {
 }
 
 Effect.BlindDown = function(element) {
-  element = $(element);
+  element = $PR(element);
   var elementDimensions = element.getDimensions();
   return new Effect.Scale(element, 100, 
     Object.extend({ scaleContent: false, 
@@ -623,7 +623,7 @@ Effect.BlindDown = function(element) {
 }
 
 Effect.SwitchOff = function(element) {
-  element = $(element);
+  element = $PR(element);
   var oldOpacity = element.getInlineOpacity();
   return new Effect.Appear(element, { 
     duration: 0.4,
@@ -649,7 +649,7 @@ Effect.SwitchOff = function(element) {
 }
 
 Effect.DropOut = function(element) {
-  element = $(element);
+  element = $PR(element);
   var oldStyle = {
     top: element.getStyle('top'),
     left: element.getStyle('left'),
@@ -671,7 +671,7 @@ Effect.DropOut = function(element) {
 }
 
 Effect.Shake = function(element) {
-  element = $(element);
+  element = $PR(element);
   var oldStyle = {
     top: element.getStyle('top'),
     left: element.getStyle('left') };
@@ -693,10 +693,10 @@ Effect.Shake = function(element) {
 }
 
 Effect.SlideDown = function(element) {
-  element = $(element);
+  element = $PR(element);
   element.cleanWhitespace();
   // SlideDown need to have the content of the element wrapped in a container element with fixed height!
-  var oldInnerBottom = $(element.firstChild).getStyle('bottom');
+  var oldInnerBottom = $PR(element.firstChild).getStyle('bottom');
   var elementDimensions = element.getDimensions();
   return new Effect.Scale(element, 100, Object.extend({ 
     scaleContent: false, 
@@ -731,9 +731,9 @@ Effect.SlideDown = function(element) {
 }
   
 Effect.SlideUp = function(element) {
-  element = $(element);
+  element = $PR(element);
   element.cleanWhitespace();
-  var oldInnerBottom = $(element.firstChild).getStyle('bottom');
+  var oldInnerBottom = $PR(element.firstChild).getStyle('bottom');
   return new Effect.Scale(element, window.opera ? 0 : 1,
    Object.extend({ scaleContent: false, 
     scaleX: false, 
@@ -772,7 +772,7 @@ Effect.Squish = function(element) {
 }
 
 Effect.Grow = function(element) {
-  element = $(element);
+  element = $PR(element);
   var options = Object.extend({
     direction: 'center',
     moveTransition: Effect.Transitions.sinoidal,
@@ -851,7 +851,7 @@ Effect.Grow = function(element) {
 }
 
 Effect.Shrink = function(element) {
-  element = $(element);
+  element = $PR(element);
   var options = Object.extend({
     direction: 'center',
     moveTransition: Effect.Transitions.sinoidal,
@@ -908,7 +908,7 @@ Effect.Shrink = function(element) {
 }
 
 Effect.Pulsate = function(element) {
-  element = $(element);
+  element = $PR(element);
   var options    = arguments[1] || {};
   var oldOpacity = element.getInlineOpacity();
   var transition = options.transition || Effect.Transitions.sinoidal;
@@ -921,7 +921,7 @@ Effect.Pulsate = function(element) {
 }
 
 Effect.Fold = function(element) {
-  element = $(element);
+  element = $PR(element);
   var oldStyle = {
     top: element.style.top,
     left: element.style.left,
@@ -952,7 +952,7 @@ Element.Methods.visualEffect = function(element, effect, options) {
   s = effect.gsub(/_/, '-').camelize();
   effect_class = s.charAt(0).toUpperCase() + s.substring(1);
   new Effect[effect_class](element, options);
-  return $(element);
+  return $PR(element);
 };
 
-Element.addMethods();
+Element.addMethods();

library/cropper/lib/prototype.js

@@ -784,9 +784,9 @@ Ajax.Updater = Class.create();
 Object.extend(Object.extend(Ajax.Updater.prototype, Ajax.Request.prototype), {
   initialize: function(container, url, options) {
     this.containers = {
-      success: container.success ? $(container.success) : $(container),
+      success: container.success ? $PR(container.success) : $PR(container),
-      failure: container.failure ? $(container.failure) :
+      failure: container.failure ? $PR(container.failure) :
-        (container.success ? null : $(container))
+        (container.success ? null : $PR(container))
     }
 
     this.transport = Ajax.getTransport();
@@ -866,7 +866,7 @@ Ajax.PeriodicalUpdater.prototype = Object.extend(new Ajax.Base(), {
     this.updater = new Ajax.Updater(this.container, this.url, this.options);
   }
 });
-function $() {
+function $PR() {
   var results = [], element;
   for (var i = 0; i < arguments.length; i++) {
     element = arguments[i];
@@ -878,7 +878,7 @@ function $() {
 }
 
 document.getElementsByClassName = function(className, parentElement) {
-  var children = ($(parentElement) || document.body).getElementsByTagName('*');
+  var children = ($PR(parentElement) || document.body).getElementsByTagName('*');
   return $A(children).inject([], function(elements, child) {
     if (child.className.match(new RegExp("(^|\\s)" + className + "(\\s|$)")))
       elements.push(Element.extend(child));
@@ -918,42 +918,42 @@ Element.extend.cache = {
 
 Element.Methods = {
   visible: function(element) {
-    return $(element).style.display != 'none';
+    return $PR(element).style.display != 'none';
   },
 
   toggle: function() {
     for (var i = 0; i < arguments.length; i++) {
-      var element = $(arguments[i]);
+      var element = $PR(arguments[i]);
       Element[Element.visible(element) ? 'hide' : 'show'](element);
     }
   },
 
   hide: function() {
     for (var i = 0; i < arguments.length; i++) {
-      var element = $(arguments[i]);
+      var element = $PR(arguments[i]);
       element.style.display = 'none';
     }
   },
 
   show: function() {
     for (var i = 0; i < arguments.length; i++) {
-      var element = $(arguments[i]);
+      var element = $PR(arguments[i]);
       element.style.display = '';
     }
   },
 
   remove: function(element) {
-    element = $(element);
+    element = $PR(element);
     element.parentNode.removeChild(element);
   },
 
   update: function(element, html) {
-    $(element).innerHTML = html.stripScripts();
+    $PR(element).innerHTML = html.stripScripts();
     setTimeout(function() {html.evalScripts()}, 10);
   },
 
   replace: function(element, html) {
-    element = $(element);
+    element = $PR(element);
     if (element.outerHTML) {
       element.outerHTML = html.stripScripts();
     } else {
@@ -966,7 +966,7 @@ Element.Methods = {
   },
 
   getHeight: function(element) {
-    element = $(element);
+    element = $PR(element);
     return element.offsetHeight;
   },
 
@@ -975,23 +975,23 @@ Element.Methods = {
   },
 
   hasClassName: function(element, className) {
-    if (!(element = $(element))) return;
+    if (!(element = $PR(element))) return;
     return Element.classNames(element).include(className);
   },
 
   addClassName: function(element, className) {
-    if (!(element = $(element))) return;
+    if (!(element = $PR(element))) return;
     return Element.classNames(element).add(className);
   },
 
   removeClassName: function(element, className) {
-    if (!(element = $(element))) return;
+    if (!(element = $PR(element))) return;
     return Element.classNames(element).remove(className);
   },
 
   // removes whitespace-only text node children
   cleanWhitespace: function(element) {
-    element = $(element);
+    element = $PR(element);
     for (var i = 0; i < element.childNodes.length; i++) {
       var node = element.childNodes[i];
       if (node.nodeType == 3 && !/\S/.test(node.nodeValue))
@@ -1000,25 +1000,25 @@ Element.Methods = {
   },
 
   empty: function(element) {
-    return $(element).innerHTML.match(/^\s*$/);
+    return $PR(element).innerHTML.match(/^\s*$/);
   },
 
   childOf: function(element, ancestor) {
-    element = $(element), ancestor = $(ancestor);
+    element = $PR(element), ancestor = $PR(ancestor);
     while (element = element.parentNode)
       if (element == ancestor) return true;
     return false;
   },
 
   scrollTo: function(element) {
-    element = $(element);
+    element = $PR(element);
     var x = element.x ? element.x : element.offsetLeft,
         y = element.y ? element.y : element.offsetTop;
     window.scrollTo(x, y);
   },
 
   getStyle: function(element, style) {
-    element = $(element);
+    element = $PR(element);
     var value = element.style[style.camelize()];
     if (!value) {
       if (document.defaultView && document.defaultView.getComputedStyle) {
@@ -1036,13 +1036,13 @@ Element.Methods = {
   },
 
   setStyle: function(element, style) {
-    element = $(element);
+    element = $PR(element);
     for (var name in style)
       element.style[name.camelize()] = style[name];
   },
 
   getDimensions: function(element) {
-    element = $(element);
+    element = $PR(element);
     if (Element.getStyle(element, 'display') != 'none')
       return {width: element.offsetWidth, height: element.offsetHeight};
 
@@ -1063,7 +1063,7 @@ Element.Methods = {
   },
 
   makePositioned: function(element) {
-    element = $(element);
+    element = $PR(element);
     var pos = Element.getStyle(element, 'position');
     if (pos == 'static' || !pos) {
       element._madePositioned = true;
@@ -1078,7 +1078,7 @@ Element.Methods = {
   },
 
   undoPositioned: function(element) {
-    element = $(element);
+    element = $PR(element);
     if (element._madePositioned) {
       element._madePositioned = undefined;
       element.style.position =
@@ -1090,7 +1090,7 @@ Element.Methods = {
   },
 
   makeClipping: function(element) {
-    element = $(element);
+    element = $PR(element);
     if (element._overflow) return;
     element._overflow = element.style.overflow;
     if ((Element.getStyle(element, 'overflow') || 'visible') != 'hidden')
@@ -1098,7 +1098,7 @@ Element.Methods = {
   },
 
   undoClipping: function(element) {
-    element = $(element);
+    element = $PR(element);
     if (element._overflow) return;
     element.style.overflow = element._overflow;
     element._overflow = undefined;
@@ -1141,7 +1141,7 @@ Abstract.Insertion = function(adjacency) {
 
 Abstract.Insertion.prototype = {
   initialize: function(element, content) {
-    this.element = $(element);
+    this.element = $PR(element);
     this.content = content.stripScripts();
 
     if (this.adjacency && this.element.insertAdjacentHTML) {
@@ -1233,7 +1233,7 @@ Insertion.After.prototype = Object.extend(new Abstract.Insertion('afterEnd'), {
 Element.ClassNames = Class.create();
 Element.ClassNames.prototype = {
   initialize: function(element) {
-    this.element = $(element);
+    this.element = $PR(element);
   },
 
   _each: function(iterator) {
@@ -1346,7 +1346,7 @@ Selector.prototype = {
   findElements: function(scope) {
     var element;
 
-    if (element = $(this.params.id))
+    if (element = $PR(this.params.id))
       if (this.match(element))
         if (!scope || Element.childOf(element, scope))
           return [element];
@@ -1377,25 +1377,25 @@ function $$() {
 var Field = {
   clear: function() {
     for (var i = 0; i < arguments.length; i++)
-      $(arguments[i]).value = '';
+      $PR(arguments[i]).value = '';
   },
 
   focus: function(element) {
-    $(element).focus();
+    $PR(element).focus();
   },
 
   present: function() {
     for (var i = 0; i < arguments.length; i++)
-      if ($(arguments[i]).value == '') return false;
+      if ($PR(arguments[i]).value == '') return false;
     return true;
   },
 
   select: function(element) {
-    $(element).select();
+    $PR(element).select();
   },
 
   activate: function(element) {
-    element = $(element);
+    element = $PR(element);
     element.focus();
     if (element.select)
       element.select();
@@ -1406,7 +1406,7 @@ var Field = {
 
 var Form = {
   serialize: function(form) {
-    var elements = Form.getElements($(form));
+    var elements = Form.getElements($PR(form));
     var queryComponents = new Array();
 
     for (var i = 0; i < elements.length; i++) {
@@ -1419,7 +1419,7 @@ var Form = {
   },
 
   getElements: function(form) {
-    form = $(form);
+    form = $PR(form);
     var elements = new Array();
 
     for (var tagName in Form.Element.Serializers) {
@@ -1431,7 +1431,7 @@ var Form = {
   },
 
   getInputs: function(form, typeName, name) {
-    form = $(form);
+    form = $PR(form);
     var inputs = form.getElementsByTagName('input');
 
     if (!typeName && !name)
@@ -1478,13 +1478,13 @@ var Form = {
   },
 
   reset: function(form) {
-    $(form).reset();
+    $PR(form).reset();
   }
 }
 
 Form.Element = {
   serialize: function(element) {
-    element = $(element);
+    element = $PR(element);
     var method = element.tagName.toLowerCase();
     var parameter = Form.Element.Serializers[method](element);
 
@@ -1502,7 +1502,7 @@ Form.Element = {
   },
 
   getValue: function(element) {
-    element = $(element);
+    element = $PR(element);
     var method = element.tagName.toLowerCase();
     var parameter = Form.Element.Serializers[method](element);
 
@@ -1570,7 +1570,7 @@ Abstract.TimedObserver = function() {}
 Abstract.TimedObserver.prototype = {
   initialize: function(element, frequency, callback) {
     this.frequency = frequency;
-    this.element   = $(element);
+    this.element   = $PR(element);
     this.callback  = callback;
 
     this.lastValue = this.getValue();
@@ -1609,7 +1609,7 @@ Form.Observer.prototype = Object.extend(new Abstract.TimedObserver(), {
 Abstract.EventObserver = function() {}
 Abstract.EventObserver.prototype = {
   initialize: function(element, callback) {
-    this.element  = $(element);
+    this.element  = $PR(element);
     this.callback = callback;
 
     this.lastValue = this.getValue();
@@ -1742,7 +1742,7 @@ Object.extend(Event, {
   },
 
   observe: function(element, name, observer, useCapture) {
-    var element = $(element);
+    var element = $PR(element);
     useCapture = useCapture || false;
 
     if (name == 'keypress' &&
@@ -1754,7 +1754,7 @@ Object.extend(Event, {
   },
 
   stopObserving: function(element, name, observer, useCapture) {
-    var element = $(element);
+    var element = $PR(element);
     useCapture = useCapture || false;
 
     if (name == 'keypress' &&
@@ -1876,8 +1876,8 @@ var Position = {
   },
 
   clone: function(source, target) {
-    source = $(source);
+    source = $PR(source);
-    target = $(target);
+    target = $PR(target);
     target.style.position = 'absolute';
     var offsets = this.cumulativeOffset(source);
     target.style.top    = offsets[1] + 'px';
@@ -1920,11 +1920,11 @@ var Position = {
     }, arguments[2] || {})
 
     // find page position of source
-    source = $(source);
+    source = $PR(source);
     var p = Position.page(source);
 
     // find coordinate system to use
-    target = $(target);
+    target = $PR(target);
     var delta = [0, 0];
     var parent = null;
     // delta [0,0] will do fine with position: fixed elements,
@@ -1948,7 +1948,7 @@ var Position = {
   },
 
   absolutize: function(element) {
-    element = $(element);
+    element = $PR(element);
     if (element.style.position == 'absolute') return;
     Position.prepare();
 
@@ -1971,7 +1971,7 @@ var Position = {
   },
 
   relativize: function(element) {
-    element = $(element);
+    element = $PR(element);
     if (element.style.position == 'relative') return;
     Position.prepare();
 
@@ -2003,4 +2003,4 @@ if (/Konqueror|Safari|KHTML/.test(navigator.userAgent)) {
 
     return [valueL, valueT];
   }
-}
+}

library/cropper/lib/slider.js

@@ -35,12 +35,12 @@ Control.Slider.prototype = {
     var slider = this;
     
     if(handle instanceof Array) {
-      this.handles = handle.collect( function(e) { return $(e) });
+      this.handles = handle.collect( function(e) { return $PR(e) });
     } else {
-      this.handles = [$(handle)];
+      this.handles = [$PR(handle)];
     }
     
-    this.track   = $(track);
+    this.track   = $PR(track);
     this.options = options || {};
 
     this.axis      = this.options.axis || 'horizontal';
@@ -50,9 +50,9 @@ Control.Slider.prototype = {
     
     this.value     = 0; // assure backwards compat
     this.values    = this.handles.map( function() { return 0 });
-    this.spans     = this.options.spans ? this.options.spans.map(function(s){ return $(s) }) : false;
+    this.spans     = this.options.spans ? this.options.spans.map(function(s){ return $PR(s) }) : false;
-    this.options.startSpan = $(this.options.startSpan || null);
+    this.options.startSpan = $PR(this.options.startSpan || null);
-    this.options.endSpan   = $(this.options.endSpan || null);
+    this.options.endSpan   = $PR(this.options.endSpan || null);
 
     this.restricted = this.options.restricted || false;
 
@@ -280,4 +280,4 @@ Control.Slider.prototype = {
       this.options.onChange(this.values.length>1 ? this.values : this.value, this);
     this.event = null;
   }
-}
+}

library/cropper/lib/unittest.js

@@ -32,7 +32,7 @@ Event.simulateMouse = function(element, eventName) {
   var oEvent = document.createEvent("MouseEvents");
   oEvent.initMouseEvent(eventName, true, true, document.defaultView, 
     options.buttons, options.pointerX, options.pointerY, options.pointerX, options.pointerY, 
-    false, false, false, false, 0, $(element));
+    false, false, false, false, 0, $PR(element));
   
   if(this.mark) Element.remove(this.mark);
   this.mark = document.createElement('div');
@@ -49,7 +49,7 @@ Event.simulateMouse = function(element, eventName) {
   if(this.step)
     alert('['+new Date().getTime().toString()+'] '+eventName+'/'+Test.Unit.inspect(options));
   
-  $(element).dispatchEvent(oEvent);
+  $PR(element).dispatchEvent(oEvent);
 };
 
 // Note: Due to a fix in Firefox 1.0.5/6 that probably fixed "too much", this doesn't work in 1.0.6 or DP2.
@@ -69,7 +69,7 @@ Event.simulateKey = function(element, eventName) {
   oEvent.initKeyEvent(eventName, true, true, window, 
     options.ctrlKey, options.altKey, options.shiftKey, options.metaKey,
     options.keyCode, options.charCode );
-  $(element).dispatchEvent(oEvent);
+  $PR(element).dispatchEvent(oEvent);
 };
 
 Event.simulateKeys = function(element, command) {
@@ -87,7 +87,7 @@ Test.Unit.inspect = Object.inspect;
 Test.Unit.Logger = Class.create();
 Test.Unit.Logger.prototype = {
   initialize: function(log) {
-    this.log = $(log);
+    this.log = $PR(log);
     if (this.log) {
       this._createLogTable();
     }
@@ -126,8 +126,8 @@ Test.Unit.Logger.prototype = {
     '<thead><tr><th>Status</th><th>Test</th><th>Message</th></tr></thead>' +
     '<tbody id="loglines"></tbody>' +
     '</table>';
-    this.logsummary = $('logsummary')
+    this.logsummary = $PR('logsummary')
-    this.loglines = $('loglines');
+    this.loglines = $PR('loglines');
   },
   _toHTML: function(txt) {
     return txt.escapeHTML().replace(/\n/g,"<br/>");
@@ -142,7 +142,7 @@ Test.Unit.Runner.prototype = {
     }, arguments[1] || {});
     this.options.resultsURL = this.parseResultsURLQueryParameter();
     if (this.options.testLog) {
-      this.options.testLog = $(this.options.testLog) || null;
+      this.options.testLog = $PR(this.options.testLog) || null;
     }
     if(this.options.tests) {
       this.tests = [];
@@ -326,7 +326,7 @@ Test.Unit.Assertions.prototype = {
     catch(e) { this.error(e); } 
   },
   _isVisible: function(element) {
-    element = $(element);
+    element = $PR(element);
     if(!element.parentNode) return true;
     this.assertNotNull(element);
     if(element.style && Element.getStyle(element, 'display') == 'none')

library/cropper/tests/example-Basic.htm

@@ -13,12 +13,12 @@
 		
 		// setup the callback function
 		function onEndCrop( coords, dimensions ) {
-			$( 'x1' ).value = coords.x1;
+			$PR( 'x1' ).value = coords.x1;
-			$( 'y1' ).value = coords.y1;
+			$PR( 'y1' ).value = coords.y1;
-			$( 'x2' ).value = coords.x2;
+			$PR( 'x2' ).value = coords.x2;
-			$( 'y2' ).value = coords.y2;
+			$PR( 'y2' ).value = coords.y2;
-			$( 'width' ).value = dimensions.width;
+			$PR( 'width' ).value = dimensions.width;
-			$( 'height' ).value = dimensions.height;
+			$PR( 'height' ).value = dimensions.height;
 		}
 		
 		// basic example

library/cropper/tests/example-CSS-Absolute.htm

@@ -13,12 +13,12 @@
 		
 		// setup the callback function
 		function onEndCrop( coords, dimensions ) {
-			$( 'x1' ).value = coords.x1;
+			$PR( 'x1' ).value = coords.x1;
-			$( 'y1' ).value = coords.y1;
+			$PR( 'y1' ).value = coords.y1;
-			$( 'x2' ).value = coords.x2;
+			$PR( 'x2' ).value = coords.x2;
-			$( 'y2' ).value = coords.y2;
+			$PR( 'y2' ).value = coords.y2;
-			$( 'width' ).value = dimensions.width;
+			$PR( 'width' ).value = dimensions.width;
-			$( 'height' ).value = dimensions.height;
+			$PR( 'height' ).value = dimensions.height;
 		}
 				
 		// Absolute positioned example

library/cropper/tests/example-CSS-Float.htm

@@ -13,12 +13,12 @@
 		
 		// setup the callback function
 		function onEndCrop( coords, dimensions ) {
-			$( 'x1' ).value = coords.x1;
+			$PR( 'x1' ).value = coords.x1;
-			$( 'y1' ).value = coords.y1;
+			$PR( 'y1' ).value = coords.y1;
-			$( 'x2' ).value = coords.x2;
+			$PR( 'x2' ).value = coords.x2;
-			$( 'y2' ).value = coords.y2;
+			$PR( 'y2' ).value = coords.y2;
-			$( 'width' ).value = dimensions.width;
+			$PR( 'width' ).value = dimensions.width;
-			$( 'height' ).value = dimensions.height;
+			$PR( 'height' ).value = dimensions.height;
 		}
 		
 		// float example
@@ -30,12 +30,12 @@
 					'testFloatImage',
 					{ 
 						onEndCrop: function( coords, dimensions ) {
-							$( 'floatX1' ).value = coords.x1;
+							$PR( 'floatX1' ).value = coords.x1;
-							$( 'floatY1' ).value = coords.y1;
+							$PR( 'floatY1' ).value = coords.y1;
-							$( 'floatX2' ).value = coords.x2;
+							$PR( 'floatX2' ).value = coords.x2;
-							$( 'floatY2' ).value = coords.y2;
+							$PR( 'floatY2' ).value = coords.y2;
-							$( 'floatWidth' ).value = dimensions.width;
+							$PR( 'floatWidth' ).value = dimensions.width;
-							$( 'floatHeight' ).value = dimensions.height;
+							$PR( 'floatHeight' ).value = dimensions.height;
 						}
 					}
 				);

library/cropper/tests/example-CSS-Relative.htm

@@ -13,12 +13,12 @@
 		
 		// setup the callback function
 		function onEndCrop( coords, dimensions ) {
-			$( 'x1' ).value = coords.x1;
+			$PR( 'x1' ).value = coords.x1;
-			$( 'y1' ).value = coords.y1;
+			$PR( 'y1' ).value = coords.y1;
-			$( 'x2' ).value = coords.x2;
+			$PR( 'x2' ).value = coords.x2;
-			$( 'y2' ).value = coords.y2;
+			$PR( 'y2' ).value = coords.y2;
-			$( 'width' ).value = dimensions.width;
+			$PR( 'width' ).value = dimensions.width;
-			$( 'height' ).value = dimensions.height;
+			$PR( 'height' ).value = dimensions.height;
 		}
 		
 		// relative example

library/cropper/tests/example-CoordsOnLoad.htm

@@ -13,12 +13,12 @@
 		
 		// setup the callback function
 		function onEndCrop( coords, dimensions ) {
-			$( 'x1' ).value = coords.x1;
+			$PR( 'x1' ).value = coords.x1;
-			$( 'y1' ).value = coords.y1;
+			$PR( 'y1' ).value = coords.y1;
-			$( 'x2' ).value = coords.x2;
+			$PR( 'x2' ).value = coords.x2;
-			$( 'y2' ).value = coords.y2;
+			$PR( 'y2' ).value = coords.y2;
-			$( 'width' ).value = dimensions.width;
+			$PR( 'width' ).value = dimensions.width;
-			$( 'height' ).value = dimensions.height;
+			$PR( 'height' ).value = dimensions.height;
 		}
 		
 		// basic example

library/cropper/tests/example-CoordsOnLoadWithRatio.htm

@@ -13,12 +13,12 @@
 		
 		// setup the callback function
 		function onEndCrop( coords, dimensions ) {
-			$( 'x1' ).value = coords.x1;
+			$PR( 'x1' ).value = coords.x1;
-			$( 'y1' ).value = coords.y1;
+			$PR( 'y1' ).value = coords.y1;
-			$( 'x2' ).value = coords.x2;
+			$PR( 'x2' ).value = coords.x2;
-			$( 'y2' ).value = coords.y2;
+			$PR( 'y2' ).value = coords.y2;
-			$( 'width' ).value = dimensions.width;
+			$PR( 'width' ).value = dimensions.width;
-			$( 'height' ).value = dimensions.height;
+			$PR( 'height' ).value = dimensions.height;
 		}
 		
 		// basic example

library/cropper/tests/example-Dimensions.htm

@@ -12,12 +12,12 @@
 	<script type="text/javascript" charset="utf-8">
 		
 		function onEndCrop( coords, dimensions ) {
-			$( 'x1' ).value = coords.x1;
+			$PR( 'x1' ).value = coords.x1;
-			$( 'y1' ).value = coords.y1;
+			$PR( 'y1' ).value = coords.y1;
-			$( 'x2' ).value = coords.x2;
+			$PR( 'x2' ).value = coords.x2;
-			$( 'y2' ).value = coords.y2;
+			$PR( 'y2' ).value = coords.y2;
-			$( 'width' ).value = dimensions.width;
+			$PR( 'width' ).value = dimensions.width;
-			$( 'height' ).value = dimensions.height;
+			$PR( 'height' ).value = dimensions.height;
 		}
 		
 		/*

library/cropper/tests/example-DynamicImage.htm

@@ -55,9 +55,9 @@
 			 * @return void
 			 */
 			setImage: function( imgSrc, w, h ) {
-				$( 'testImage' ).src = imgSrc;
+				$PR( 'testImage' ).src = imgSrc;
-				$( 'testImage' ).width = w;
+				$PR( 'testImage' ).width = w;
-				$( 'testImage' ).height = h;
+				$PR( 'testImage' ).height = h;
 				this.attachCropper();
 			},
 			
@@ -98,12 +98,12 @@
 		
 		// setup the callback function
 		function onEndCrop( coords, dimensions ) {
-			$( 'x1' ).value = coords.x1;
+			$PR( 'x1' ).value = coords.x1;
-			$( 'y1' ).value = coords.y1;
+			$PR( 'y1' ).value = coords.y1;
-			$( 'x2' ).value = coords.x2;
+			$PR( 'x2' ).value = coords.x2;
-			$( 'y2' ).value = coords.y2;
+			$PR( 'y2' ).value = coords.y2;
-			$( 'width' ).value = dimensions.width;
+			$PR( 'width' ).value = dimensions.width;
-			$( 'height' ).value = dimensions.height;
+			$PR( 'height' ).value = dimensions.height;
 		}
 		
 		// basic example
@@ -112,9 +112,9 @@
 			'load', 
 			function() { 
 				CropImageManager.init();
-				Event.observe( $('removeCropper'), 'click', CropImageManager.removeCropper.bindAsEventListener( CropImageManager ), false );
+				Event.observe( $PR('removeCropper'), 'click', CropImageManager.removeCropper.bindAsEventListener( CropImageManager ), false );
-				Event.observe( $('resetCropper'), 'click', CropImageManager.resetCropper.bindAsEventListener( CropImageManager ), false );
+				Event.observe( $PR('resetCropper'), 'click', CropImageManager.resetCropper.bindAsEventListener( CropImageManager ), false );
-				Event.observe( $('imageChoice'), 'change', CropImageManager.onChange.bindAsEventListener( CropImageManager ), false );
+				Event.observe( $PR('imageChoice'), 'change', CropImageManager.onChange.bindAsEventListener( CropImageManager ), false );
 			}
 		); 		
 		
@@ -168,7 +168,7 @@
 	
 	<p>
 		<input type="button" id="removeCropper" value="Remove Cropper" />
-		<input type="button" id="resetCropper" value="Reset Cropper" />
+		<input type="button" id="resetCropper" value="Reset Cropper" />
 	</p>
 	
 	

library/cropper/tests/example-FixedRatio.htm

@@ -12,12 +12,12 @@
 	<script type="text/javascript" charset="utf-8">
 		
 		function onEndCrop( coords, dimensions ) {
-			$( 'x1' ).value = coords.x1;
+			$PR( 'x1' ).value = coords.x1;
-			$( 'y1' ).value = coords.y1;
+			$PR( 'y1' ).value = coords.y1;
-			$( 'x2' ).value = coords.x2;
+			$PR( 'x2' ).value = coords.x2;
-			$( 'y2' ).value = coords.y2;
+			$PR( 'y2' ).value = coords.y2;
-			$( 'width' ).value = dimensions.width;
+			$PR( 'width' ).value = dimensions.width;
-			$( 'height' ).value = dimensions.height;
+			$PR( 'height' ).value = dimensions.height;
 		}
 		
 		// with a supplied ratio

library/cropper/tests/example-MinimumDimensions.htm

@@ -12,12 +12,12 @@
 	<script type="text/javascript" charset="utf-8">
 		
 		function onEndCrop( coords, dimensions ) {
-			$( 'x1' ).value = coords.x1;
+			$PR( 'x1' ).value = coords.x1;
-			$( 'y1' ).value = coords.y1;
+			$PR( 'y1' ).value = coords.y1;
-			$( 'x2' ).value = coords.x2;
+			$PR( 'x2' ).value = coords.x2;
-			$( 'y2' ).value = coords.y2;
+			$PR( 'y2' ).value = coords.y2;
-			$( 'width' ).value = dimensions.width;
+			$PR( 'width' ).value = dimensions.width;
-			$( 'height' ).value = dimensions.height;
+			$PR( 'height' ).value = dimensions.height;
 		}
 		
 		// example with minimum dimensions

library/cropper/tests/example-MinimumWidth.htm

@@ -12,12 +12,12 @@
 	<script type="text/javascript" charset="utf-8">
 		
 		function onEndCrop( coords, dimensions ) {
-			$( 'x1' ).value = coords.x1;
+			$PR( 'x1' ).value = coords.x1;
-			$( 'y1' ).value = coords.y1;
+			$PR( 'y1' ).value = coords.y1;
-			$( 'x2' ).value = coords.x2;
+			$PR( 'x2' ).value = coords.x2;
-			$( 'y2' ).value = coords.y2;
+			$PR( 'y2' ).value = coords.y2;
-			$( 'width' ).value = dimensions.width;
+			$PR( 'width' ).value = dimensions.width;
-			$( 'height' ).value = dimensions.height;
+			$PR( 'height' ).value = dimensions.height;
 		}
 		
 		// example with minimum dimensions

library/cropper/tests/example-Preview.htm

@@ -12,12 +12,12 @@
 	<script type="text/javascript" charset="utf-8">
 		
 		function onEndCrop( coords, dimensions ) {
-			$( 'x1' ).value = coords.x1;
+			$PR( 'x1' ).value = coords.x1;
-			$( 'y1' ).value = coords.y1;
+			$PR( 'y1' ).value = coords.y1;
-			$( 'x2' ).value = coords.x2;
+			$PR( 'x2' ).value = coords.x2;
-			$( 'y2' ).value = coords.y2;
+			$PR( 'y2' ).value = coords.y2;
-			$( 'width' ).value = dimensions.width;
+			$PR( 'width' ).value = dimensions.width;
-			$( 'height' ).value = dimensions.height;
+			$PR( 'height' ).value = dimensions.height;
 		}
 		
 		// example with a preview of crop results, must have minimumm dimensions

util/minifyjs.sh

@@ -13,12 +13,10 @@ JSFILES=(
 	"js/main.js"
 	"js/webtoolkit.base64.js"
 	"view/theme/frost/js/acl.js"
-	"view/theme/frost/js/fk.autocomplete.js"
 	"view/theme/frost/js/jquery.divgrow-1.3.1.f1.js"
 	"view/theme/frost/js/main.js"
 	"view/theme/frost/js/theme.js"
 	"view/theme/frost-mobile/js/acl.js"
-	"view/theme/frost-mobile/js/fk.autocomplete.js"
 	"view/theme/frost-mobile/js/jquery.divgrow-1.3.1.f1.js"
 	"view/theme/frost-mobile/js/main.js"
 	"view/theme/frost-mobile/js/theme.js"

view/templates/cropbody.tpl

@@ -1,8 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 <h1>{{$title}}</h1>
 <p id="cropimage-desc">
 {{$desc}}
@@ -17,12 +12,12 @@
 <script type="text/javascript" language="javascript">
 
 	function onEndCrop( coords, dimensions ) {
-		$( 'x1' ).value = coords.x1;
+		$PR( 'x1' ).value = coords.x1;
-		$( 'y1' ).value = coords.y1;
+		$PR( 'y1' ).value = coords.y1;
-		$( 'x2' ).value = coords.x2;
+		$PR( 'x2' ).value = coords.x2;
-		$( 'y2' ).value = coords.y2;
+		$PR( 'y2' ).value = coords.y2;
-		$( 'width' ).value = dimensions.width;
+		$PR( 'width' ).value = dimensions.width;
-		$( 'height' ).value = dimensions.height;
+		$PR( 'height' ).value = dimensions.height;
 	}
 
 	Event.observe( window, 'load', function() {

view/templates/crophead.tpl

@@ -1,8 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
       <script type="text/javascript" src="library/cropper/lib/prototype.js" language="javascript"></script>
       <script type="text/javascript" src="library/cropper/lib/scriptaculous.js?load=effects,builder,dragdrop" language="javascript"></script>
       <script type="text/javascript" src="library/cropper/cropper.js" language="javascript"></script>

view/templates/field_combobox.tpl

@@ -1,8 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 	
 	<div class='field combobox'>
 		<label for='id_{{$field.0}}' id='id_{{$field.0}}_label'>{{$field.1}}</label>

view/templates/field_input.tpl

@@ -1,10 +1,5 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 	
-	<div class='field input'>
+	<div class='field input' id='wrapper_{{$field.0}}'>
 		<label for='id_{{$field.0}}'>{{$field.1}}</label>
 		<input name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}">
 		<span class='field_help'>{{$field.3}}</span>

view/templates/field_openid.tpl

@@ -1,10 +1,5 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 	
-	<div class='field input openid'>
+	<div class='field input openid' id='wrapper_{{$field.0}}'>
 		<label for='id_{{$field.0}}'>{{$field.1}}</label>
 		<input name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}">
 		<span class='field_help'>{{$field.3}}</span>

view/templates/field_password.tpl

@@ -1,10 +1,5 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 	
-	<div class='field password'>
+	<div class='field password' id='wrapper_{{$field.0}}'>
 		<label for='id_{{$field.0}}'>{{$field.1}}</label>
 		<input type='password' name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}">
 		<span class='field_help'>{{$field.3}}</span>

view/templates/login_head.tpl

@@ -1,5 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}

view/templates/posted_date_widget.tpl

@@ -1,8 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 <div id="datebrowse-sidebar" class="widget">
 	<h3>{{$title}}</h3>
 <script>function dateSubmit(dateurl) { window.location.href = dateurl; } </script>

view/theme/decaf-mobile/js/theme.js

@@ -23,11 +23,11 @@ document.addEventListener('DOMContentLoaded', function(){
 			window.imageUploadButton,
 			{ action: 'wall_upload/'+window.nickname,
 				name: 'userfile',
-				onSubmit: function(file,ext) { $j('#profile-rotator').show(); },
+				onSubmit: function(file,ext) { $('#profile-rotator').show(); },
 				onComplete: function(file,response) {
-					var currentText = $j(window.jotId).val();
+					var currentText = $(window.jotId).val();
-					$j(window.jotId).val(currentText + response);
+					$(window.jotId).val(currentText + response);
-					$j('#profile-rotator').hide();
+					$('#profile-rotator').hide();
 				}				 
 			}
 		);
@@ -37,11 +37,11 @@ document.addEventListener('DOMContentLoaded', function(){
 				'wall-file-upload',
 				{ action: 'wall_attach/'+window.nickname,
 					name: 'userfile',
-					onSubmit: function(file,ext) { $j('#profile-rotator').show(); },
+					onSubmit: function(file,ext) { $('#profile-rotator').show(); },
 					onComplete: function(file,response) {
-						var currentText = $j(window.jotId).val();
+						var currentText = $(window.jotId).val();
-						$j(window.jotId).val(currentText + response);
+						$(window.jotId).val(currentText + response);
-						$j('#profile-rotator').hide();
+						$('#profile-rotator').hide();
 					}				 
 				}
 			);

view/theme/decaf-mobile/js/theme.min.js

@@ -1 +1 @@
-document.addEventListener("DOMContentLoaded",function(){if(typeof window.AjaxUpload!="undefined"){var uploader=new window.AjaxUpload(window.imageUploadButton,{action:"wall_upload/"+window.nickname,name:"userfile",onSubmit:function(file,ext){$j("#profile-rotator").show()},onComplete:function(file,response){var currentText=$j(window.jotId).val();$j(window.jotId).val(currentText+response);$j("#profile-rotator").hide()}});if(document.getElementById("wall-file-upload")!=null){var file_uploader=new window.AjaxUpload("wall-file-upload",{action:"wall_attach/"+window.nickname,name:"userfile",onSubmit:function(file,ext){$j("#profile-rotator").show()},onComplete:function(file,response){var currentText=$j(window.jotId).val();$j(window.jotId).val(currentText+response);$j("#profile-rotator").hide()}})}}});function confirmDelete(f){response=confirm(window.delItem);if(response&&typeof f=="function"){f()}return response}function changeHref(elemId,url){elem=document.getElementById(elemId);elem.href=url}function remove(elemId){elem=document.getElementById(elemId);elem.parentNode.removeChild(elem)}function openClose(el){}
+document.addEventListener("DOMContentLoaded",function(){if(typeof window.AjaxUpload!="undefined"){var uploader=new window.AjaxUpload(window.imageUploadButton,{action:"wall_upload/"+window.nickname,name:"userfile",onSubmit:function(file,ext){$("#profile-rotator").show()},onComplete:function(file,response){var currentText=$(window.jotId).val();$(window.jotId).val(currentText+response);$("#profile-rotator").hide()}});if(document.getElementById("wall-file-upload")!=null){var file_uploader=new window.AjaxUpload("wall-file-upload",{action:"wall_attach/"+window.nickname,name:"userfile",onSubmit:function(file,ext){$("#profile-rotator").show()},onComplete:function(file,response){var currentText=$(window.jotId).val();$(window.jotId).val(currentText+response);$("#profile-rotator").hide()}})}}});function confirmDelete(f){response=confirm(window.delItem);if(response&&typeof f=="function"){f()}return response}function changeHref(elemId,url){elem=document.getElementById(elemId);elem.href=url}function remove(elemId){elem=document.getElementById(elemId);elem.parentNode.removeChild(elem)}function openClose(el){}

view/theme/decaf-mobile/templates/admin_users.tpl

@@ -1,8 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 <script>
 	function confirm_delete(uname){
 		return confirm( "{{$confirm_delete}}".format(uname));
@@ -11,7 +6,7 @@
 		return confirm("{{$confirm_delete_multi}}");
 	}
 	{{*/*function selectall(cls){
-		$j("."+cls).attr('checked','checked');
+		$("."+cls).attr('checked','checked');
 		return false;
 	}*/*}}
 </script>

view/theme/decaf-mobile/templates/cropbody.tpl

@@ -1,8 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 <h1>{{$title}}</h1>
 <p id="cropimage-desc">
 {{$desc}}

view/theme/decaf-mobile/templates/cropend.tpl

@@ -1,8 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 {{*<!--      <script type="text/javascript" src="library/cropper/lib/prototype.js" language="javascript"></script>
       <script type="text/javascript" src="library/cropper/lib/scriptaculous.js?load=effects,builder,dragdrop" language="javascript"></script>
       <script type="text/javascript" src="library/cropper/cropper.js" language="javascript"></script>

view/theme/decaf-mobile/templates/crophead.tpl

@@ -1,6 +1 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
       <link rel="stylesheet" href="library/cropper/cropper.css" type="text/css" />

view/theme/decaf-mobile/templates/end.tpl

@@ -11,7 +11,6 @@
   tinyMCE.init({ mode : "none"});
 </script>-->*}}
 {{*<!--<script type="text/javascript" src="{{$baseurl}}/js/jquery.js" ></script>
-<script type="text/javascript">var $j = jQuery.noConflict();</script>
 <script type="text/javascript" src="{{$baseurl}}/view/theme/decaf-mobile/js/jquery.divgrow-1.3.1.f1.js" ></script>
 <script type="text/javascript" src="{{$baseurl}}/js/jquery.textinputs.js" ></script>
 <script type="text/javascript" src="{{$baseurl}}/view/theme/decaf-mobile/js/fk.autocomplete.js" ></script>-->*}}
@@ -25,6 +24,5 @@
 <script type="text/javascript" src="{{$baseurl}}/view/theme/decaf-mobile/js/theme.js"></script>
 
 <!--<script type="text/javascript" src="{{$baseurl}}/view/theme/decaf-mobile/js/jquery.package.js" ></script>
-<script type="text/javascript">var $j = jQuery.noConflict();</script>
 <script type="text/javascript" src="{{$baseurl}}/view/theme/decaf-mobile/js/decaf-mobile.package.js" ></script>-->
 

view/theme/decaf-mobile/templates/field_input.tpl

@@ -1,8 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 	
 	<div class='field input' id='wrapper_{{$field.0}}'>
 		<label for='id_{{$field.0}}'>{{$field.1}}</label><br />

view/theme/decaf-mobile/templates/jot_geotag.tpl

@@ -1,16 +1,11 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 
 	if(navigator.geolocation) {
 		navigator.geolocation.getCurrentPosition(function(position) {
 			var lat = position.coords.latitude.toFixed(4);
 			var lon = position.coords.longitude.toFixed(4);
 
-			$j('#jot-coord').val(lat + ', ' + lon);
+			$('#jot-coord').val(lat + ', ' + lon);
-			$j('#profile-nolocation-wrapper').show();
+			$('#profile-nolocation-wrapper').show();
 		});
 	}
 

view/theme/decaf-mobile/templates/settings_display_end.tpl

@@ -1,7 +1,2 @@
-{{*
+	<script>$(function(){ previewTheme($("#id_{{$theme.0}}")[0]); });</script>
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-	<script>$j(function(){ previewTheme($j("#id_{{$theme.0}}")[0]); });</script>
 

view/theme/decaf-mobile/theme.php

@@ -28,6 +28,6 @@ function decaf_mobile_content_loaded(&$a) {
 		$a->theme['stylesheet'] = $a->get_baseurl() . '/view/theme/decaf-mobile/login-style.css';
 	}
 	if( $a->module === 'login' )
-		$a->page['end'] .= '<script type="text/javascript"> $j(document).ready(function() { $j("#id_" + window.loginName).focus();} );</script>';
+		$a->page['end'] .= '<script type="text/javascript"> $(document).ready(function() { $("#id_" + window.loginName).focus();} );</script>';
 
 }

view/theme/frost-mobile/js/acl.js

@@ -13,41 +13,41 @@ function ACL(backend_url, preset){
 	that.group_uids = [];
 	that.nw = 2; //items per row. should be calulated from #acl-list.width
 	
-	that.list_content = $j("#acl-list-content");
+	that.list_content = $("#acl-list-content");
-	that.item_tpl = unescape($j(".acl-list-item[rel=acl-template]").html());
+	that.item_tpl = unescape($(".acl-list-item[rel=acl-template]").html());
-	that.showall = $j("#acl-showall");
+	that.showall = $("#acl-showall");
 
 	if (preset.length==0) that.showall.addClass("selected");
 	
 	/*events*/
 	that.showall.click(that.on_showall);
-	$j(".acl-button-show").live('click', that.on_button_show);
+	$(".acl-button-show").live('click', that.on_button_show);
-	$j(".acl-button-hide").live('click', that.on_button_hide);
+	$(".acl-button-hide").live('click', that.on_button_hide);
-	$j("#acl-search").keypress(that.on_search);
+	$("#acl-search").keypress(that.on_search);
-	$j("#acl-wrapper").parents("form").submit(that.on_submit);
+	$("#acl-wrapper").parents("form").submit(that.on_submit);
 	
 	/* startup! */
 	that.get(0,100);
 }
 
 ACL.prototype.on_submit = function(){
-	aclfileds = $j("#acl-fields").html("");
+	aclfileds = $("#acl-fields").html("");
-	$j(that.allow_gid).each(function(i,v){
+	$(that.allow_gid).each(function(i,v){
 		aclfileds.append("<input type='hidden' name='group_allow[]' value='"+v+"'>");
 	});
-	$j(that.allow_cid).each(function(i,v){
+	$(that.allow_cid).each(function(i,v){
 		aclfileds.append("<input type='hidden' name='contact_allow[]' value='"+v+"'>");
 	});
-	$j(that.deny_gid).each(function(i,v){
+	$(that.deny_gid).each(function(i,v){
 		aclfileds.append("<input type='hidden' name='group_deny[]' value='"+v+"'>");
 	});
-	$j(that.deny_cid).each(function(i,v){
+	$(that.deny_cid).each(function(i,v){
 		aclfileds.append("<input type='hidden' name='contact_deny[]' value='"+v+"'>");
 	});	
 }
 
 ACL.prototype.search = function(){
-	var srcstr = $j("#acl-search").val();
+	var srcstr = $("#acl-search").val();
 	that.list_content.html("");
 	that.get(0,100, srcstr);
 }
@@ -82,10 +82,10 @@ ACL.prototype.on_button_show = function(event){
 	event.stopPropagation();
 
 	/*that.showall.removeClass("selected");
-	$j(this).siblings(".acl-button-hide").removeClass("selected");
+	$(this).siblings(".acl-button-hide").removeClass("selected");
-	$j(this).toggleClass("selected");*/
+	$(this).toggleClass("selected");*/
 
-	that.set_allow($j(this).parent().attr('id'));
+	that.set_allow($(this).parent().attr('id'));
 
 	return false;
 }
@@ -95,10 +95,10 @@ ACL.prototype.on_button_hide = function(event){
 	event.stopPropagation();
 
 	/*that.showall.removeClass("selected");
-	$j(this).siblings(".acl-button-show").removeClass("selected");
+	$(this).siblings(".acl-button-show").removeClass("selected");
-	$j(this).toggleClass("selected");*/
+	$(this).toggleClass("selected");*/
 
-	that.set_deny($j(this).parent().attr('id'));
+	that.set_deny($(this).parent().attr('id'));
 
 	return false;
 }
@@ -156,32 +156,32 @@ ACL.prototype.update_view = function(){
 		that.deny_gid.length==0 && that.deny_cid.length==0){
 			that.showall.addClass("selected");
 			/* jot acl */
-				$j('#jot-perms-icon').removeClass('lock').addClass('unlock');
+				$('#jot-perms-icon').removeClass('lock').addClass('unlock');
-				$j('#jot-public').show();
+				$('#jot-public').show();
-				$j('.profile-jot-net input').attr('disabled', false);			
+				$('.profile-jot-net input').attr('disabled', false);			
 				if(typeof editor != 'undefined' && editor != false) {
-					$j('#profile-jot-desc').html(window.isPublic);
+					$('#profile-jot-desc').html(window.isPublic);
 				}
 			
 	} else {
 			that.showall.removeClass("selected");
 			/* jot acl */
-				$j('#jot-perms-icon').removeClass('unlock').addClass('lock');
+				$('#jot-perms-icon').removeClass('unlock').addClass('lock');
-				$j('#jot-public').hide();
+				$('#jot-public').hide();
-				$j('.profile-jot-net input').attr('disabled', 'disabled');			
+				$('.profile-jot-net input').attr('disabled', 'disabled');			
-				$j('#profile-jot-desc').html('&nbsp;');
+				$('#profile-jot-desc').html('&nbsp;');
 	}
-	$j("#acl-list-content .acl-list-item").each(function(){
+	$("#acl-list-content .acl-list-item").each(function(){
-		$j(this).removeClass("groupshow grouphide");
+		$(this).removeClass("groupshow grouphide");
 	});
 	
-	$j("#acl-list-content .acl-list-item").each(function(){
+	$("#acl-list-content .acl-list-item").each(function(){
-		itemid = $j(this).attr('id');
+		itemid = $(this).attr('id');
 		type = itemid[0];
 		id 	 = parseInt(itemid.substr(1));
 		
-		btshow = $j(this).children(".acl-button-show").removeClass("selected");
+		btshow = $(this).children(".acl-button-show").removeClass("selected");
-		bthide = $j(this).children(".acl-button-hide").removeClass("selected");	
+		bthide = $(this).children(".acl-button-hide").removeClass("selected");	
 		
 		switch(type){
 			case "g":
@@ -197,16 +197,16 @@ ACL.prototype.update_view = function(){
 					uclass="grouphide";
 				}
 				
-				$j(that.group_uids[id]).each(function(i,v) {
+				$(that.group_uids[id]).each(function(i,v) {
 					if(uclass == "grouphide")
-						$j("#c"+v).removeClass("groupshow");
+						$("#c"+v).removeClass("groupshow");
 					if(uclass != "") {
-						var cls = $j("#c"+v).attr('class');
+						var cls = $("#c"+v).attr('class');
 						if( cls == undefined)
 							return true;
 						var hiding = cls.indexOf('grouphide');
 						if(hiding == -1)
-							$j("#c"+v).addClass(uclass);
+							$("#c"+v).addClass(uclass);
 					}
 				});
 				
@@ -234,7 +234,7 @@ ACL.prototype.get = function(start,count, search){
 		search:search,
 	}
 	
-	$j.ajax({
+	$.ajax({
 		type:'POST',
 		url: that.url,
 		data: postdata,
@@ -246,16 +246,16 @@ ACL.prototype.get = function(start,count, search){
 ACL.prototype.populate = function(data){
 /*	var height = Math.ceil(data.tot / that.nw) * 42;
 	that.list_content.height(height);*/
-	$j(data.items).each(function(){
+	$(data.items).each(function(){
 		html = "<div class='acl-list-item {4} {5}' title='{6}' id='{2}{3}'>"+that.item_tpl+"</div>";
 		html = html.format( this.photo, this.name, this.type, this.id, '', this.network, this.link );
 		if (this.uids!=undefined) that.group_uids[this.id] = this.uids;
 		//console.log(html);
 		that.list_content.append(html);
 	});
-	$j(".acl-list-item img[data-src]", that.list_content).each(function(i, el){
+	$(".acl-list-item img[data-src]", that.list_content).each(function(i, el){
 		// Add src attribute for images with a data-src attribute
-		$j(el).attr('src', $j(el).data("src"));
+		$(el).attr('src', $(el).data("src"));
 	});
 	that.update_view();
 }

view/theme/frost-mobile/js/main.js

@@ -10,14 +10,14 @@
 		listID = listID.replace(/\./g, "\\.");
 		listID = listID.replace(/@/g, "\\@");
 
-		if($j(listID).is(":visible")) {
+		if($(listID).is(":visible")) {
-			$j(listID).hide();
+			$(listID).hide();
-			$j(listID+"-wrapper").show();
+			$(listID+"-wrapper").show();
-			alert($j(listID+"-wrapper").attr("id"));
+			alert($(listID+"-wrapper").attr("id"));
 		}
 		else {
-			$j(listID).show();
+			$(listID).show();
-			$j(listID+"-wrapper").hide();
+			$(listID+"-wrapper").hide();
 		}
 	}
 
@@ -46,16 +46,16 @@
 	var last_popup_menu = null;
 	var last_popup_button = null;
 
-	$j(function() {
+	$(function() {
-		$j.ajaxSetup({cache: false});
+		$.ajaxSetup({cache: false});
 
-		msie = $j.browser.msie ;
+		msie = $.browser.msie ;
 		
 		collapseHeight();
 
 		/* setup tooltips *//*
-		$j("a,.tt").each(function(){
+		$("a,.tt").each(function(){
-			var e = $j(this);
+			var e = $(this);
 			var pos="bottom";
 			if (e.hasClass("tttop")) pos="top";
 			if (e.hasClass("ttbottom")) pos="bottom";
@@ -67,19 +67,19 @@
 		
 		
 		/* setup onoff widgets */
-		$j(".onoff input").each(function(){
+		$(".onoff input").each(function(){
-			val = $j(this).val();
+			val = $(this).val();
-			id = $j(this).attr("id");
+			id = $(this).attr("id");
-			$j("#"+id+"_onoff ."+ (val==0?"on":"off")).addClass("hidden");
+			$("#"+id+"_onoff ."+ (val==0?"on":"off")).addClass("hidden");
 			
 		});
-		$j(".onoff > a").click(function(event){
+		$(".onoff > a").click(function(event){
 			event.preventDefault();	
-			var input = $j(this).siblings("input");
+			var input = $(this).siblings("input");
 			var val = 1-input.val();
 			var id = input.attr("id");
-			$j("#"+id+"_onoff ."+ (val==0?"on":"off")).addClass("hidden");
+			$("#"+id+"_onoff ."+ (val==0?"on":"off")).addClass("hidden");
-			$j("#"+id+"_onoff ."+ (val==1?"on":"off")).removeClass("hidden");
+			$("#"+id+"_onoff ."+ (val==1?"on":"off")).removeClass("hidden");
 			input.val(val);
 			//console.log(id);
 		});
@@ -91,129 +91,129 @@
 		function close_last_popup_menu(e) {
 
  			if( last_popup_menu ) {
-				if( '#' + last_popup_menu.attr('id') !== $j(e.target).attr('rel')) {
+				if( '#' + last_popup_menu.attr('id') !== $(e.target).attr('rel')) {
 		 			last_popup_menu.hide();
-					if (last_popup_menu.attr('id') == "nav-notifications-menu" ) $j('.main-container').show();
+					if (last_popup_menu.attr('id') == "nav-notifications-menu" ) $('.main-container').show();
 		 			last_popup_button.removeClass("selected");
 		 			last_popup_menu = null;
 		 			last_popup_button = null;
 				}
 			}
 		}
-		$j('img[rel^=#]').click(function(e){
+		$('img[rel^=#]').click(function(e){
 
 			close_last_popup_menu(e);
-			menu = $j( $j(this).attr('rel') );
+			menu = $( $(this).attr('rel') );
 			e.preventDefault();
 			e.stopPropagation();
 
 			if (menu.attr('popup')=="false") return false;
 
-//			$j(this).parent().toggleClass("selected");
+//			$(this).parent().toggleClass("selected");
 //			menu.toggle();
 
 			if (menu.css("display") == "none") {
-				$j(this).parent().addClass("selected");
+				$(this).parent().addClass("selected");
 				menu.show();
-				if (menu.attr('id') == "nav-notifications-menu" ) $j('.main-container').hide();
+				if (menu.attr('id') == "nav-notifications-menu" ) $('.main-container').hide();
 				last_popup_menu = menu;
-				last_popup_button = $j(this).parent();
+				last_popup_button = $(this).parent();
 			} else {
-				$j(this).parent().removeClass("selected");
+				$(this).parent().removeClass("selected");
 				menu.hide();
-				if (menu.attr('id') == "nav-notifications-menu" ) $j('.main-container').show();
+				if (menu.attr('id') == "nav-notifications-menu" ) $('.main-container').show();
 				last_popup_menu = null;
 				last_popup_button = null;
 			}
 			return false;
 		});
-		$j('html').click(function(e) {
+		$('html').click(function(e) {
 			close_last_popup_menu(e);
 		});
 		
 		// fancyboxes
-		/*$j("a.popupbox").colorbox({
+		/*$("a.popupbox").colorbox({
 			'inline' : true,
 			'transition' : 'none'
 		});*/
 		
 
 		/* notifications template */
-		var notifications_tpl= unescape($j("#nav-notifications-template[rel=template]").html());
+		var notifications_tpl= unescape($("#nav-notifications-template[rel=template]").html());
-		var notifications_all = unescape($j('<div>').append( $j("#nav-notifications-see-all").clone() ).html()); //outerHtml hack
+		var notifications_all = unescape($('<div>').append( $("#nav-notifications-see-all").clone() ).html()); //outerHtml hack
-		var notifications_mark = unescape($j('<div>').append( $j("#nav-notifications-mark-all").clone() ).html()); //outerHtml hack
+		var notifications_mark = unescape($('<div>').append( $("#nav-notifications-mark-all").clone() ).html()); //outerHtml hack
-		var notifications_empty = unescape($j("#nav-notifications-menu").html());
+		var notifications_empty = unescape($("#nav-notifications-menu").html());
 		
 		/* nav update event  */
-		$j('nav').bind('nav-update', function(e,data){;
+		$('nav').bind('nav-update', function(e,data){;
-			var invalid = $j(data).find('invalid').text();
+			var invalid = $(data).find('invalid').text();
 			if(invalid == 1) { window.location.href=window.location.href }
 
-			var net = $j(data).find('net').text();
+			var net = $(data).find('net').text();
-			if(net == 0) { net = ''; $j('#net-update').removeClass('show') } else { $j('#net-update').addClass('show') }
+			if(net == 0) { net = ''; $('#net-update').removeClass('show') } else { $('#net-update').addClass('show') }
-			$j('#net-update').html(net);
+			$('#net-update').html(net);
 
-			var home = $j(data).find('home').text();
+			var home = $(data).find('home').text();
-			if(home == 0) { home = '';  $j('#home-update').removeClass('show') } else { $j('#home-update').addClass('show') }
+			if(home == 0) { home = '';  $('#home-update').removeClass('show') } else { $('#home-update').addClass('show') }
-			$j('#home-update').html(home);
+			$('#home-update').html(home);
 			
-			var intro = $j(data).find('intro').text();
+			var intro = $(data).find('intro').text();
-			if(intro == 0) { intro = '';  $j('#intro-update').removeClass('show') } else { $j('#intro-update').addClass('show') }
+			if(intro == 0) { intro = '';  $('#intro-update').removeClass('show') } else { $('#intro-update').addClass('show') }
-			$j('#intro-update').html(intro);
+			$('#intro-update').html(intro);
 
-			var mail = $j(data).find('mail').text();
+			var mail = $(data).find('mail').text();
-			if(mail == 0) { mail = '';  $j('#mail-update').removeClass('show') } else { $j('#mail-update').addClass('show') }
+			if(mail == 0) { mail = '';  $('#mail-update').removeClass('show') } else { $('#mail-update').addClass('show') }
-			$j('#mail-update').html(mail);
+			$('#mail-update').html(mail);
 			
-			var intro = $j(data).find('intro').text();
+			var intro = $(data).find('intro').text();
-			if(intro == 0) { intro = '';  $j('#intro-update-li').removeClass('show') } else { $j('#intro-update-li').addClass('show') }
+			if(intro == 0) { intro = '';  $('#intro-update-li').removeClass('show') } else { $('#intro-update-li').addClass('show') }
-			$j('#intro-update-li').html(intro);
+			$('#intro-update-li').html(intro);
 
-			var mail = $j(data).find('mail').text();
+			var mail = $(data).find('mail').text();
-			if(mail == 0) { mail = '';  $j('#mail-update-li').removeClass('show') } else { $j('#mail-update-li').addClass('show') }
+			if(mail == 0) { mail = '';  $('#mail-update-li').removeClass('show') } else { $('#mail-update-li').addClass('show') }
-			$j('#mail-update-li').html(mail);
+			$('#mail-update-li').html(mail);
 
-			var eNotif = $j(data).find('notif')
+			var eNotif = $(data).find('notif')
 			
 			if (eNotif.children("note").length==0){
-				$j("#nav-notifications-menu").html(notifications_empty);
+				$("#nav-notifications-menu").html(notifications_empty);
 			} else {
-				nnm = $j("#nav-notifications-menu");
+				nnm = $("#nav-notifications-menu");
 				nnm.html(notifications_all + notifications_mark);
 				//nnm.attr('popup','true');
 				eNotif.children("note").each(function(){
-					e = $j(this);
+					e = $(this);
 					text = e.text().format("<span class='contactname'>"+e.attr('name')+"</span>");
 					html = notifications_tpl.format(e.attr('href'),e.attr('photo'), text, e.attr('date'), e.attr('seen'));
 					nnm.append(html);
 				});
 
-				$j("img[data-src]", nnm).each(function(i, el){
+				$("img[data-src]", nnm).each(function(i, el){
 					// Add src attribute for images with a data-src attribute
 					// However, don't bother if the data-src attribute is empty, because
 					// an empty "src" tag for an image will cause some browsers
 					// to prefetch the root page of the Friendica hub, which will
 					// unnecessarily load an entire profile/ or network/ page
-					if($j(el).data("src") != '') $j(el).attr('src', $j(el).data("src"));
+					if($(el).data("src") != '') $(el).attr('src', $(el).data("src"));
 				});
 			}
 			notif = eNotif.attr('count');
 			if (notif>0){
-				$j("#nav-notifications-linkmenu").addClass("on");
+				$("#nav-notifications-linkmenu").addClass("on");
 			} else {
-				$j("#nav-notifications-linkmenu").removeClass("on");
+				$("#nav-notifications-linkmenu").removeClass("on");
 			}
-			if(notif == 0) { notif = ''; $j('#notify-update').removeClass('show') } else { $j('#notify-update').addClass('show') }
+			if(notif == 0) { notif = ''; $('#notify-update').removeClass('show') } else { $('#notify-update').addClass('show') }
-			$j('#notify-update').html(notif);
+			$('#notify-update').html(notif);
 			
-			var eSysmsg = $j(data).find('sysmsgs');
+			var eSysmsg = $(data).find('sysmsgs');
 			eSysmsg.children("notice").each(function(){
-				text = $j(this).text();
+				text = $(this).text();
-				$j.jGrowl(text, { sticky: false, theme: 'notice', life: 1000 });
+				$.jGrowl(text, { sticky: false, theme: 'notice', life: 1000 });
 			});
 			eSysmsg.children("info").each(function(){
-				text = $j(this).text();
+				text = $(this).text();
-				$j.jGrowl(text, { sticky: false, theme: 'info', life: 1000 });
+				$.jGrowl(text, { sticky: false, theme: 'info', life: 1000 });
 			});
 			
 		});
@@ -221,7 +221,7 @@
 		
  		NavUpdate(); 
 		// Allow folks to stop the ajax page updates with the pause/break key
-/*		$j(document).keydown(function(event) {
+/*		$(document).keydown(function(event) {
 			if(event.keyCode == '8') {
 				var target = event.target || event.srcElement;
 				if (!/input|textarea/i.test(target.nodeName)) {
@@ -235,7 +235,7 @@
 					if (event.ctrlKey) {
 						totStopped = true;
 					}
-					$j('#pause').html('<img src="images/pause.gif" alt="pause" style="border: 1px solid black;" />');
+					$('#pause').html('<img src="images/pause.gif" alt="pause" style="border: 1px solid black;" />');
 				} else {
 					unpause();
 				}
@@ -253,28 +253,28 @@
 
 		if(! stopped) {
 			var pingCmd = 'ping' + ((localUser != 0) ? '?f=&uid=' + localUser : '');
-			$j.get(pingCmd,function(data) {
+			$.get(pingCmd,function(data) {
-				$j(data).find('result').each(function() {
+				$(data).find('result').each(function() {
 					// send nav-update event
-					$j('nav').trigger('nav-update', this);
+					$('nav').trigger('nav-update', this);
 					
 					
 					// start live update
 
 					
 
-					if($j('#live-network').length)   { src = 'network'; liveUpdate(); }
+					if($('#live-network').length)   { src = 'network'; liveUpdate(); }
-					if($j('#live-profile').length)   { src = 'profile'; liveUpdate(); }
+					if($('#live-profile').length)   { src = 'profile'; liveUpdate(); }
-					if($j('#live-community').length) { src = 'community'; liveUpdate(); }
+					if($('#live-community').length) { src = 'community'; liveUpdate(); }
-					if($j('#live-notes').length)     { src = 'notes'; liveUpdate(); }
+					if($('#live-notes').length)     { src = 'notes'; liveUpdate(); }
-					if($j('#live-display').length) { src = 'display'; liveUpdate(); }
+					if($('#live-display').length) { src = 'display'; liveUpdate(); }
-					/*if($j('#live-display').length) {
+					/*if($('#live-display').length) {
 						if(liking) {
 							liking = 0;
 							window.location.href=window.location.href 
 						}
 					}*/
-					if($j('#live-photos').length) {
+					if($('#live-photos').length) {
 						if(liking) {
 							liking = 0;
 							window.location.href=window.location.href 
@@ -291,8 +291,8 @@
 	}
 
 	function liveUpdate() {
-		if((src == null) || (stopped) || (typeof profile_uid == 'undefined') || (! profile_uid)) { $j('.like-rotator').hide(); return; }
+		if((src == null) || (stopped) || (typeof profile_uid == 'undefined') || (! profile_uid)) { $('.like-rotator').hide(); return; }
-		if(($j('.comment-edit-text-full').length) || (in_progress)) {
+		if(($('.comment-edit-text-full').length) || (in_progress)) {
 			if(livetime) {
 				clearTimeout(livetime);
 			}
@@ -308,50 +308,50 @@
 		var udargs = ((netargs.length) ? '/' + netargs : '');
 		var update_url = 'update_' + src + udargs + '&p=' + profile_uid + '&page=' + profile_page + '&msie=' + ((msie) ? 1 : 0);
 
-		$j.get(update_url,function(data) {
+		$.get(update_url,function(data) {
 			in_progress = false;
-			//			$j('.collapsed-comments',data).each(function() {
+			//			$('.collapsed-comments',data).each(function() {
-			//	var ident = $j(this).attr('id');
+			//	var ident = $(this).attr('id');
-			//	var is_hidden = $j('#' + ident).is(':hidden');
+			//	var is_hidden = $('#' + ident).is(':hidden');
-			//	if($j('#' + ident).length) {
+			//	if($('#' + ident).length) {
-			//		$j('#' + ident).replaceWith($j(this));
+			//		$('#' + ident).replaceWith($(this));
 			//		if(is_hidden)
-			//			$j('#' + ident).hide();
+			//			$('#' + ident).hide();
 			//	}
 			//});
 
 			// add a new thread
 
-			$j('.toplevel_item',data).each(function() {
+			$('.toplevel_item',data).each(function() {
-				var ident = $j(this).attr('id');
+				var ident = $(this).attr('id');
 
-				if($j('#' + ident).length == 0 && profile_page == 1) {
+				if($('#' + ident).length == 0 && profile_page == 1) {
-					$j('img',this).each(function() {
+					$('img',this).each(function() {
-						$j(this).attr('src',$j(this).attr('dst'));
+						$(this).attr('src',$(this).attr('dst'));
 					});
-					$j('#' + prev).after($j(this));
+					$('#' + prev).after($(this));
 				}
 				else {
 					// Find out if the hidden comments are open, so we can keep it that way
 					// if a new comment has been posted
-					var id = $j('.hide-comments-total', this).attr('id');
+					var id = $('.hide-comments-total', this).attr('id');
 					if(typeof id != 'undefined') {
 						id = id.split('-')[3];
-						var commentsOpen = $j("#collapsed-comments-" + id).is(":visible");
+						var commentsOpen = $("#collapsed-comments-" + id).is(":visible");
 					}
 
-					$j('img',this).each(function() {
+					$('img',this).each(function() {
-						$j(this).attr('src',$j(this).attr('dst'));
+						$(this).attr('src',$(this).attr('dst'));
 					});
-					//vScroll = $j(document).scrollTop();
+					//vScroll = $(document).scrollTop();
-					$j('html').height($j('html').height());
+					$('html').height($('html').height());
-					$j('#' + ident).replaceWith($j(this));
+					$('#' + ident).replaceWith($(this));
 
 					if(typeof id != 'undefined') {
 						if(commentsOpen) showHideComments(id);
 					}
-					$j('html').height('auto');
+					$('html').height('auto');
-					//$j(document).scrollTop(vScroll);
+					//$(document).scrollTop(vScroll);
 				}
 				prev = ident;
 			});
@@ -363,36 +363,36 @@
 
 			/*prev = 'live-' + src;
 
-			$j('.wall-item-outside-wrapper',data).each(function() {
+			$('.wall-item-outside-wrapper',data).each(function() {
-				var ident = $j(this).attr('id');
+				var ident = $(this).attr('id');
 
-				if($j('#' + ident).length == 0 && prev != 'live-' + src) {
+				if($('#' + ident).length == 0 && prev != 'live-' + src) {
-						$j('img',this).each(function() {
+						$('img',this).each(function() {
-							$j(this).attr('src',$j(this).attr('dst'));
+							$(this).attr('src',$(this).attr('dst'));
 						});
-						$j('#' + prev).after($j(this));
+						$('#' + prev).after($(this));
 				}
 				else { 
-					$j('#' + ident + ' ' + '.wall-item-ago').replaceWith($j(this).find('.wall-item-ago')); 
+					$('#' + ident + ' ' + '.wall-item-ago').replaceWith($(this).find('.wall-item-ago')); 
-					if($j('#' + ident + ' ' + '.comment-edit-text-empty').length)
+					if($('#' + ident + ' ' + '.comment-edit-text-empty').length)
-						$j('#' + ident + ' ' + '.wall-item-comment-wrapper').replaceWith($j(this).find('.wall-item-comment-wrapper'));
+						$('#' + ident + ' ' + '.wall-item-comment-wrapper').replaceWith($(this).find('.wall-item-comment-wrapper'));
-					$j('#' + ident + ' ' + '.hide-comments-total').replaceWith($j(this).find('.hide-comments-total'));
+					$('#' + ident + ' ' + '.hide-comments-total').replaceWith($(this).find('.hide-comments-total'));
-					$j('#' + ident + ' ' + '.wall-item-like').replaceWith($j(this).find('.wall-item-like'));
+					$('#' + ident + ' ' + '.wall-item-like').replaceWith($(this).find('.wall-item-like'));
-					$j('#' + ident + ' ' + '.wall-item-dislike').replaceWith($j(this).find('.wall-item-dislike'));
+					$('#' + ident + ' ' + '.wall-item-dislike').replaceWith($(this).find('.wall-item-dislike'));
-					$j('#' + ident + ' ' + '.my-comment-photo').each(function() {
+					$('#' + ident + ' ' + '.my-comment-photo').each(function() {
-						$j(this).attr('src',$j(this).attr('dst'));
+						$(this).attr('src',$(this).attr('dst'));
 					});
 				}
 				prev = ident; 
 			});*/
 			
-			$j('.like-rotator').hide();
+			$('.like-rotator').hide();
 			if(commentBusy) {
 				commentBusy = false;
-				$j('body').css('cursor', 'auto');
+				$('body').css('cursor', 'auto');
 			}
 			/* autocomplete @nicknames */
-			$j(".comment-edit-form  textarea").contact_autocomplete(baseurl+"/acl");
+			$(".comment-edit-form  textarea").contact_autocomplete(baseurl+"/acl");
 
 			// setup videos, since VideoJS won't take care of any loaded via AJAX
 			if(typeof videojs != 'undefined') videojs.autoSetup();
@@ -404,22 +404,22 @@
 		if(typeof elems != 'undefined') {
 			elemName = elems + ' ' + elemName;
 		}
-		$j(elemName).each(function() {
+		$(elemName).each(function() {
-			if($j(this).height() > 350) {
+			if($(this).height() > 350) {
-				$j('html').height($j('html').height());
+				$('html').height($('html').height());
-				$j(this).divgrow({ initialHeight: 300, showBrackets: false, speed: 0 });
+				$(this).divgrow({ initialHeight: 300, showBrackets: false, speed: 0 });
-				$j(this).addClass('divmore');
+				$(this).addClass('divmore');
-				$j('html').height('auto');
+				$('html').height('auto');
 			}
 		});
 	}
 
 /*	function imgbright(node) {
-		$j(node).removeClass("drophide").addClass("drop");
+		$(node).removeClass("drophide").addClass("drop");
 	}
 
 	function imgdull(node) {
-		$j(node).removeClass("drop").addClass("drophide");
+		$(node).removeClass("drop").addClass("drophide");
 	}*/
 
 	// Since our ajax calls are asynchronous, we will give a few 
@@ -434,8 +434,8 @@
 
 	function dolike(ident,verb) {
 		unpause();
-		$j('#like-rotator-' + ident.toString()).show();
+		$('#like-rotator-' + ident.toString()).show();
-		$j.get('like/' + ident.toString() + '?verb=' + verb, NavUpdate );
+		$.get('like/' + ident.toString() + '?verb=' + verb, NavUpdate );
 //		if(timer) clearTimeout(timer);
 //		timer = setTimeout(NavUpdate,3000);
 		liking = 1;
@@ -443,21 +443,21 @@
 
 	function dostar(ident) {
 		ident = ident.toString();
-		//$j('#like-rotator-' + ident).show();
+		//$('#like-rotator-' + ident).show();
-		$j.get('starred/' + ident, function(data) {
+		$.get('starred/' + ident, function(data) {
 			if(data.match(/1/)) {
-				$j('#starred-' + ident).addClass('starred');
+				$('#starred-' + ident).addClass('starred');
-				$j('#starred-' + ident).removeClass('unstarred');
+				$('#starred-' + ident).removeClass('unstarred');
-				$j('#star-' + ident).addClass('hidden');
+				$('#star-' + ident).addClass('hidden');
-				$j('#unstar-' + ident).removeClass('hidden');
+				$('#unstar-' + ident).removeClass('hidden');
 			}
 			else {			
-				$j('#starred-' + ident).addClass('unstarred');
+				$('#starred-' + ident).addClass('unstarred');
-				$j('#starred-' + ident).removeClass('starred');
+				$('#starred-' + ident).removeClass('starred');
-				$j('#star-' + ident).removeClass('hidden');
+				$('#star-' + ident).removeClass('hidden');
-				$j('#unstar-' + ident).addClass('hidden');
+				$('#unstar-' + ident).addClass('hidden');
 			}
-			//$j('#like-rotator-' + ident).hide();	
+			//$('#like-rotator-' + ident).hide();	
 		});
 	}
 
@@ -492,31 +492,31 @@
 		}
 		else {
 			lockvisible = true;
-			$j.get('lockview/' + id, function(data) {
+			$.get('lockview/' + id, function(data) {
-				$j('#panel').html(data);
+				$('#panel').html(data);
-				$j('#panel').css({ 'left': 10 , 'top': cursor.y + 20});
+				$('#panel').css({ 'left': 10 , 'top': cursor.y + 20});
-				$j('#panel').show();
+				$('#panel').show();
 			});
 		}
 	}
 
 	function lockviewhide() {
 		lockvisible = false;
-		$j('#panel').hide();
+		$('#panel').hide();
 	}
 
 	function post_comment(id) {
 		unpause();
 		commentBusy = true;
-		$j('body').css('cursor', 'wait');
+		$('body').css('cursor', 'wait');
-		$j("#comment-preview-inp-" + id).val("0");
+		$("#comment-preview-inp-" + id).val("0");
-		$j.post(  
+		$.post(  
              "item",  
-             $j("#comment-edit-form-" + id).serialize(),
+             $("#comment-edit-form-" + id).serialize(),
 			function(data) {
 				if(data.success) {
-					$j("#comment-edit-wrapper-" + id).hide();
+					$("#comment-edit-wrapper-" + id).hide();
-					$j("#comment-edit-text-" + id).val('');
+					$("#comment-edit-text-" + id).val('');
     	  			var tarea = document.getElementById("comment-edit-text-" + id);
 					if(tarea)
 						commentClose(tarea,id);
@@ -534,16 +534,16 @@
 
 
 	function preview_comment(id) {
-		$j("#comment-preview-inp-" + id).val("1");
+		$("#comment-preview-inp-" + id).val("1");
-		$j("#comment-edit-preview-" + id).show();
+		$("#comment-edit-preview-" + id).show();
-		$j.post(  
+		$.post(  
              "item",  
-             $j("#comment-edit-form-" + id).serialize(),
+             $("#comment-edit-form-" + id).serialize(),
 			function(data) {
 				if(data.preview) {
 						
-					$j("#comment-edit-preview-" + id).html(data.preview);
+					$("#comment-edit-preview-" + id).html(data.preview);
-					$j("#comment-edit-preview-" + id + " a").click(function() { return false; });
+					$("#comment-edit-preview-" + id + " a").click(function() { return false; });
 				}
 			},
 			"json"  
@@ -553,34 +553,34 @@
 
 
 	function showHideComments(id) {
-		if( $j("#collapsed-comments-" + id).is(":visible")) {
+		if( $("#collapsed-comments-" + id).is(":visible")) {
-			$j("#collapsed-comments-" + id).hide();
+			$("#collapsed-comments-" + id).hide();
-			$j("#hide-comments-" + id).html(window.showMore);
+			$("#hide-comments-" + id).html(window.showMore);
 		}
 		else {
-			$j("#collapsed-comments-" + id).show();
+			$("#collapsed-comments-" + id).show();
-			$j("#hide-comments-" + id).html(window.showFewer);
+			$("#hide-comments-" + id).html(window.showFewer);
 			collapseHeight("#collapsed-comments-" + id);
 		}
 	}
 
 
 	function preview_post() {
-		$j("#jot-preview").val("1");
+		$("#jot-preview").val("1");
-		$j("#jot-preview-content").show();
+		$("#jot-preview-content").show();
 		tinyMCE.triggerSave();
-		$j.post(  
+		$.post(  
 			"item",  
-			$j("#profile-jot-form").serialize(),
+			$("#profile-jot-form").serialize(),
 			function(data) {
 				if(data.preview) {			
-					$j("#jot-preview-content").html(data.preview);
+					$("#jot-preview-content").html(data.preview);
-					$j("#jot-preview-content" + " a").click(function() { return false; });
+					$("#jot-preview-content" + " a").click(function() { return false; });
 				}
 			},
 			"json"  
 		);  
-		$j("#jot-preview").val("0");
+		$("#jot-preview").val("0");
 		return true;  
 	}
 
@@ -589,7 +589,7 @@
 		// unpause auto reloads if they are currently stopped
 		totStopped = false;
 		stopped = false;
-	    $j('#pause').html('');
+	    $('#pause').html('');
 	}
 		
 
@@ -617,40 +617,40 @@
     }  
 
 	function groupChangeMember(gid, cid, sec_token) {
-		$j('body .fakelink').css('cursor', 'wait');
+		$('body .fakelink').css('cursor', 'wait');
-		$j.get('group/' + gid + '/' + cid + "?t=" + sec_token, function(data) {
+		$.get('group/' + gid + '/' + cid + "?t=" + sec_token, function(data) {
-				$j('#group-update-wrapper').html(data);
+				$('#group-update-wrapper').html(data);
-				$j('body .fakelink').css('cursor', 'auto');				
+				$('body .fakelink').css('cursor', 'auto');				
 		});
 	}
 
 	function profChangeMember(gid,cid) {
-		$j('body .fakelink').css('cursor', 'wait');
+		$('body .fakelink').css('cursor', 'wait');
-		$j.get('profperm/' + gid + '/' + cid, function(data) {
+		$.get('profperm/' + gid + '/' + cid, function(data) {
-				$j('#prof-update-wrapper').html(data);
+				$('#prof-update-wrapper').html(data);
-				$j('body .fakelink').css('cursor', 'auto');				
+				$('body .fakelink').css('cursor', 'auto');				
 		});
 	}
 
 	function contactgroupChangeMember(gid,cid) {
-		$j('body').css('cursor', 'wait');
+		$('body').css('cursor', 'wait');
-		$j.get('contactgroup/' + gid + '/' + cid, function(data) {
+		$.get('contactgroup/' + gid + '/' + cid, function(data) {
-				$j('body').css('cursor', 'auto');
+				$('body').css('cursor', 'auto');
 		});
 	}
 
 
 function checkboxhighlight(box) {
-  if($j(box).is(':checked')) {
+  if($(box).is(':checked')) {
-	$j(box).addClass('checkeditem');
+	$(box).addClass('checkeditem');
   }
   else {
-	$j(box).removeClass('checkeditem');
+	$(box).removeClass('checkeditem');
   }
 }
 
 function notifyMarkAll() {
-	$j.get('notify/mark/all', function(data) {
+	$.get('notify/mark/all', function(data) {
 		if(timer) clearTimeout(timer);
 		timer = setTimeout(NavUpdate,1000);
 	});
@@ -729,9 +729,9 @@ Array.prototype.remove = function(item) {
 };
 
 function previewTheme(elm) {
-	theme = $j(elm).val();
+	theme = $(elm).val();
-	$j.getJSON('pretheme?f=&theme=' + theme,function(data) {
+	$.getJSON('pretheme?f=&theme=' + theme,function(data) {
-			$j('#theme-preview').html('<div id="theme-desc">' + data.desc + '</div><div id="theme-version">' + data.version + '</div><div id="theme-credits">' + data.credits + '</div>');
+			$('#theme-preview').html('<div id="theme-desc">' + data.desc + '</div><div id="theme-version">' + data.version + '</div><div id="theme-credits">' + data.credits + '</div>');
 	});
 
 }

view/theme/frost-mobile/js/theme.js

@@ -1,60 +1,60 @@
-$j(document).ready(function() {
+$(document).ready(function() {
 
 	/* enable tinymce on focus and click */
-	$j("#profile-jot-text").focus(enableOnUser);
+	$("#profile-jot-text").focus(enableOnUser);
-	$j("#profile-jot-text").click(enableOnUser);
+	$("#profile-jot-text").click(enableOnUser);
 
-/*$j('html').click(function() { $j("#nav-notifications-menu" ).hide(); });*/
+/*$('html').click(function() { $("#nav-notifications-menu" ).hide(); });*/
 
-	/*$j('.group-edit-icon').hover(
+	/*$('.group-edit-icon').hover(
 		function() {
-			$j(this).addClass('icon'); $j(this).removeClass('iconspacer');},
+			$(this).addClass('icon'); $(this).removeClass('iconspacer');},
 		function() {
-			$j(this).removeClass('icon'); $j(this).addClass('iconspacer');}
+			$(this).removeClass('icon'); $(this).addClass('iconspacer');}
 	);
 
-	$j('.sidebar-group-element').hover(
+	$('.sidebar-group-element').hover(
 		function() {
-			id = $j(this).attr('id');
+			id = $(this).attr('id');
-			$j('#edit-' + id).addClass('icon'); $j('#edit-' + id).removeClass('iconspacer');},
+			$('#edit-' + id).addClass('icon'); $('#edit-' + id).removeClass('iconspacer');},
 
 		function() {
-			id = $j(this).attr('id');
+			id = $(this).attr('id');
-			$j('#edit-' + id).removeClass('icon');$j('#edit-' + id).addClass('iconspacer');}
+			$('#edit-' + id).removeClass('icon');$('#edit-' + id).addClass('iconspacer');}
 	);
 
 
-	$j('.savedsearchdrop').hover(
+	$('.savedsearchdrop').hover(
 		function() {
-			$j(this).addClass('drop'); $j(this).addClass('icon'); $j(this).removeClass('iconspacer');},
+			$(this).addClass('drop'); $(this).addClass('icon'); $(this).removeClass('iconspacer');},
 		function() {
-			$j(this).removeClass('drop'); $j(this).removeClass('icon'); $j(this).addClass('iconspacer');}
+			$(this).removeClass('drop'); $(this).removeClass('icon'); $(this).addClass('iconspacer');}
 	);
 
-	$j('.savedsearchterm').hover(
+	$('.savedsearchterm').hover(
 		function() {
-			id = $j(this).attr('id');
+			id = $(this).attr('id');
-			$j('#drop-' + id).addClass('icon'); 	$j('#drop-' + id).addClass('drophide'); $j('#drop-' + id).removeClass('iconspacer');},
+			$('#drop-' + id).addClass('icon'); 	$('#drop-' + id).addClass('drophide'); $('#drop-' + id).removeClass('iconspacer');},
 
 		function() {
-			id = $j(this).attr('id');
+			id = $(this).attr('id');
-			$j('#drop-' + id).removeClass('icon');$j('#drop-' + id).removeClass('drophide'); $j('#drop-' + id).addClass('iconspacer');}
+			$('#drop-' + id).removeClass('icon');$('#drop-' + id).removeClass('drophide'); $('#drop-' + id).addClass('iconspacer');}
 	);*/
 
 
-	$j('#event-share-checkbox').change(function() {
+	$('#event-share-checkbox').change(function() {
 
-		if ($j('#event-share-checkbox').is(':checked')) { 
+		if ($('#event-share-checkbox').is(':checked')) { 
-			$j('#acl-wrapper').show();
+			$('#acl-wrapper').show();
 		}
 		else {
-			$j('#acl-wrapper').hide();
+			$('#acl-wrapper').hide();
 		}
 	}).trigger('change');
 
 
-	$j(".popupbox").click(function () {
+	$(".popupbox").click(function () {
-		var parent = $j( $j(this).attr('href') ).parent();
+		var parent = $( $(this).attr('href') ).parent();
 		if (parent.css('display') == 'none') {
 			parent.show();
 		} else {
@@ -70,23 +70,23 @@ $j(document).ready(function() {
 			window.imageUploadButton,
 			{ action: 'wall_upload/'+window.nickname+'?nomce=1',
 				name: 'userfile',
-				onSubmit: function(file,ext) { $j('#profile-rotator').show(); },
+				onSubmit: function(file,ext) { $('#profile-rotator').show(); },
 				onComplete: function(file,response) {
 					addeditortext(window.jotId, response);
-					$j('#profile-rotator').hide();
+					$('#profile-rotator').hide();
 				}				 
 			}
 		);
 
-		if($j('#wall-file-upload').length) {
+		if($('#wall-file-upload').length) {
 			var file_uploader = new window.AjaxUpload(
 				'wall-file-upload',
 				{ action: 'wall_attach/'+window.nickname+'?nomce=1',
 					name: 'userfile',
-					onSubmit: function(file,ext) { $j('#profile-rotator').show(); },
+					onSubmit: function(file,ext) { $('#profile-rotator').show(); },
 					onComplete: function(file,response) {
 						addeditortext(window.jotId, response);
-						$j('#profile-rotator').hide();
+						$('#profile-rotator').hide();
 					}				 
 				}
 			);
@@ -103,17 +103,17 @@ $j(document).ready(function() {
 
 	switch(window.autocompleteType) {
 		case 'msg-header':
-			var a = $j("#recip").autocomplete({ 
+			var a = $("#recip").autocomplete({ 
 				serviceUrl: baseurl + '/acl',
 				minChars: 2,
 				width: 350,
 				onSelect: function(value,data) {
-					$j("#recip-complete").val(data);
+					$("#recip-complete").val(data);
 				}			
 			});
 			break;
 		case 'contacts-head':
-			var a = $j("#contacts-search").autocomplete({ 
+			var a = $("#contacts-search").autocomplete({ 
 				serviceUrl: baseurl + '/acl',
 				minChars: 2,
 				width: 350,
@@ -121,7 +121,7 @@ $j(document).ready(function() {
 			a.setOptions({ params: { type: 'a' }});
 			break;
 		case 'display-head':
-			$j(".comment-wwedit-wrapper textarea").contact_autocomplete(baseurl+"/acl");
+			$(".comment-wwedit-wrapper textarea").contact_autocomplete(baseurl+"/acl");
 			break;
 		default:
 			break;
@@ -129,31 +129,31 @@ $j(document).ready(function() {
 
 
 /*	if(window.autoCompleteType == "display-head") {
-		//$j(".comment-edit-wrapper textarea").contact_autocomplete(baseurl+"/acl");
+		//$(".comment-edit-wrapper textarea").contact_autocomplete(baseurl+"/acl");
 		// make auto-complete work in more places
-		//$j(".wall-item-comment-wrapper textarea").contact_autocomplete(baseurl+"/acl");
+		//$(".wall-item-comment-wrapper textarea").contact_autocomplete(baseurl+"/acl");
-		$j(".comment-wwedit-wrapper textarea").contact_autocomplete(baseurl+"/acl");
+		$(".comment-wwedit-wrapper textarea").contact_autocomplete(baseurl+"/acl");
 	}*/
 
 
 	if(window.aclType == "settings-head" || window.aclType == "photos_head" || window.aclType == "event_head") {
-		$j('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
+		$('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
 			var selstr;
-			$j('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
+			$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
-				selstr = $j(this).text();
+				selstr = $(this).text();
-				$j('#jot-perms-icon').removeClass('unlock').addClass('lock');
+				$('#jot-perms-icon').removeClass('unlock').addClass('lock');
-				$j('#jot-public').hide();
+				$('#jot-public').hide();
 			});
 			if(selstr == null) { 
-				$j('#jot-perms-icon').removeClass('lock').addClass('unlock');
+				$('#jot-perms-icon').removeClass('lock').addClass('unlock');
-				$j('#jot-public').show();
+				$('#jot-public').show();
 			}
 
 		}).trigger('change');
 	}
 
 	if(window.aclType == "event_head") {
-		$j('#events-calendar').fullCalendar({
+		$('#events-calendar').fullCalendar({
 			events: baseurl + '/events/json/',
 			header: {
 				left: 'prev,next today',
@@ -203,7 +203,7 @@ $j(document).ready(function() {
 		// center on date
 		var args=location.href.replace(baseurl,"").split("/");
 		if (args.length>=4) {
-			$j("#events-calendar").fullCalendar('gotoDate',args[2] , args[3]-1);
+			$("#events-calendar").fullCalendar('gotoDate',args[2] , args[3]-1);
 		} 
 		
 		// show event popup
@@ -214,11 +214,11 @@ $j(document).ready(function() {
 });
 
 // update pending count //
-$j(function(){
+$(function(){
 
-	$j("nav").bind('nav-update',  function(e,data){
+	$("nav").bind('nav-update',  function(e,data){
-		var elm = $j('#pending-update');
+		var elm = $('#pending-update');
-		var register = $j(data).find('register').text();
+		var register = $(data).find('register').text();
 		if (register=="0") { register=""; elm.hide();} else { elm.show(); }
 		elm.html(register);
 	});
@@ -227,7 +227,7 @@ $j(function(){
 
 
 function homeRedirect() {
-	$j('html').fadeOut('slow', function(){
+	$('html').fadeOut('slow', function(){
 		window.location = baseurl + "/login";
 	});
 }
@@ -235,12 +235,12 @@ function homeRedirect() {
 
 function initCrop() {
 	function onEndCrop( coords, dimensions ) {
-		$( 'x1' ).value = coords.x1;
+		$PR( 'x1' ).value = coords.x1;
-		$( 'y1' ).value = coords.y1;
+		$PR( 'y1' ).value = coords.y1;
-		$( 'x2' ).value = coords.x2;
+		$PR( 'x2' ).value = coords.x2;
-		$( 'y2' ).value = coords.y2;
+		$PR( 'y2' ).value = coords.y2;
-		$( 'width' ).value = dimensions.width;
+		$PR( 'width' ).value = dimensions.width;
-		$( 'height' ).value = dimensions.height;
+		$PR( 'height' ).value = dimensions.height;
 	}
 
 	Event.observe( window, 'load', function() {
@@ -261,10 +261,10 @@ function initCrop() {
 
 
 function showEvent(eventid) {
-/*	$j.get(
+/*	$.get(
 		baseurl + '/events/?id='+eventid,
 		function(data){
-			$j.colorbox({html:data});
+			$.colorbox({html:data});
 		}
 	);*/			
 }
@@ -282,27 +282,27 @@ var plaintext = 'none';//window.editSelect;
 
 function initEditor(cb){
 	if (editor==false){
-//		$j("#profile-jot-text-loading").show();
+//		$("#profile-jot-text-loading").show();
 		if(plaintext == 'none') {
-//			$j("#profile-jot-text-loading").hide();
+//			$("#profile-jot-text-loading").hide();
-			$j("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
+			$("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
-			$j("#profile-jot-text").contact_autocomplete(baseurl+"/acl");
+			$("#profile-jot-text").contact_autocomplete(baseurl+"/acl");
 			editor = true;
-/*			$j("a#jot-perms-icon").colorbox({
+/*			$("a#jot-perms-icon").colorbox({
 				'inline' : true,
 				'transition' : 'elastic'
 			});*/
-			$j("a#jot-perms-icon, a#settings-default-perms-menu").click(function () {
+			$("a#jot-perms-icon, a#settings-default-perms-menu").click(function () {
-				var parent = $j("#profile-jot-acl-wrapper").parent();
+				var parent = $("#profile-jot-acl-wrapper").parent();
 				if (parent.css('display') == 'none') {
 					parent.show();
 				} else {
 					parent.hide();
 				}
-//				$j("#profile-jot-acl-wrapper").parent().toggle();
+//				$("#profile-jot-acl-wrapper").parent().toggle();
 				return false;
 			});
-			$j(".jothidden").show();
+			$(".jothidden").show();
 			if (typeof cb!="undefined") cb();
 			return;
 		}	
@@ -352,37 +352,37 @@ function initEditor(cb){
 					}
 
 					textlen = txt.length;
-					if(textlen != 0 && $j('#jot-perms-icon').is('.unlock')) {
+					if(textlen != 0 && $('#jot-perms-icon').is('.unlock')) {
-						$j('#profile-jot-desc').html(ispublic);
+						$('#profile-jot-desc').html(ispublic);
 					}
 					else {
-						$j('#profile-jot-desc').html(' ');
+						$('#profile-jot-desc').html(' ');
 					}	 
 
 				 //Character count
 
 					if(textlen <= 140) {
-						$j('#character-counter').removeClass('red');
+						$('#character-counter').removeClass('red');
-						$j('#character-counter').removeClass('orange');
+						$('#character-counter').removeClass('orange');
-						$j('#character-counter').addClass('grey');
+						$('#character-counter').addClass('grey');
 					}
 					if((textlen > 140) && (textlen <= 420)) {
-						$j('#character-counter').removeClass('grey');
+						$('#character-counter').removeClass('grey');
-						$j('#character-counter').removeClass('red');
+						$('#character-counter').removeClass('red');
-						$j('#character-counter').addClass('orange');
+						$('#character-counter').addClass('orange');
 					}
 					if(textlen > 420) {
-						$j('#character-counter').removeClass('grey');
+						$('#character-counter').removeClass('grey');
-						$j('#character-counter').removeClass('orange');
+						$('#character-counter').removeClass('orange');
-						$j('#character-counter').addClass('red');
+						$('#character-counter').addClass('red');
 					}
-					$j('#character-counter').text(textlen);
+					$('#character-counter').text(textlen);
 				});
 
 				ed.onInit.add(function(ed) {
 					ed.pasteAsPlainText = true;
-					$j("#profile-jot-text-loading").hide();
+					$("#profile-jot-text-loading").hide();
-					$j(".jothidden").show();
+					$(".jothidden").show();
 					if (typeof cb!="undefined") cb();
 				});
 
@@ -390,7 +390,7 @@ function initEditor(cb){
 		});
 		editor = true;
 		// setup acl popup
-		$j("a#jot-perms-icon").colorbox({
+		$("a#jot-perms-icon").colorbox({
 			'inline' : true,
 			'transition' : 'elastic'
 		}); */
@@ -401,7 +401,7 @@ function initEditor(cb){
 
 function enableOnUser(){
 	if (editor) return;
-	$j(this).val("");
+	$(this).val("");
 	initEditor();
 }
 
@@ -436,9 +436,9 @@ function enableOnUser(){
 				ed.onInit.add(function(ed) {
 					ed.pasteAsPlainText = true;
 					var editorId = ed.editorId;
-					var textarea = $j('#'+editorId);
+					var textarea = $('#'+editorId);
 					if (typeof(textarea.attr('tabindex')) != "undefined") {
-						$j('#'+editorId+'_ifr').attr('tabindex', textarea.attr('tabindex'));
+						$('#'+editorId+'_ifr').attr('tabindex', textarea.attr('tabindex'));
 						textarea.attr('tabindex', null);
 					}
 				});
@@ -446,7 +446,7 @@ function enableOnUser(){
 		});
 	}
 	else
-		$j("#prvmail-text").contact_autocomplete(baseurl+"/acl");
+		$("#prvmail-text").contact_autocomplete(baseurl+"/acl");
 }*/
 
 
@@ -457,8 +457,8 @@ function enableOnUser(){
 
 function addeditortext(textElem, data) {
 	if(window.editSelect == 'none') {
-		var currentText = $j(textElem).val();
+		var currentText = $(textElem).val();
-		$j(textElem).val(currentText + data);
+		$(textElem).val(currentText + data);
 	}
 /*	else
 		tinyMCE.execCommand('mceInsertRawHTML',false,data);*/
@@ -480,22 +480,22 @@ function jotAudioURL() {
 
 
 function jotGetLocation() {
-	reply = prompt(window.whereAreU, $j('#jot-location').val());
+	reply = prompt(window.whereAreU, $('#jot-location').val());
 	if(reply && reply.length) {
-		$j('#jot-location').val(reply);
+		$('#jot-location').val(reply);
 	}
 }
 
 function jotShare(id) {
-	if ($j('#jot-popup').length != 0) $j('#jot-popup').show();
+	if ($('#jot-popup').length != 0) $('#jot-popup').show();
 
-	$j('#like-rotator-' + id).show();
+	$('#like-rotator-' + id).show();
-	$j.get('share/' + id, function(data) {
+	$.get('share/' + id, function(data) {
-		if (!editor) $j("#profile-jot-text").val("");
+		if (!editor) $("#profile-jot-text").val("");
 		initEditor(function(){
 			addeditortext("#profile-jot-text", data);
-			$j('#like-rotator-' + id).hide();
+			$('#like-rotator-' + id).hide();
-			$j(window).scrollTop(0);
+			$(window).scrollTop(0);
 		});
 
 	});
@@ -505,10 +505,10 @@ function jotGetLink() {
 	reply = prompt(window.linkURL);
 	if(reply && reply.length) {
 		reply = bin2hex(reply);
-		$j('#profile-rotator').show();
+		$('#profile-rotator').show();
-		$j.get('parse_url?binurl=' + reply, function(data) {
+		$.get('parse_url?binurl=' + reply, function(data) {
 			addeditortext(window.jotId, data);
-			$j('#profile-rotator').hide();
+			$('#profile-rotator').hide();
 		});
 	}
 }
@@ -525,20 +525,20 @@ function linkdrop(event) {
 	event.preventDefault();
 	if(reply && reply.length) {
 		reply = bin2hex(reply);
-		$j('#profile-rotator').show();
+		$('#profile-rotator').show();
-		$j.get('parse_url?binurl=' + reply, function(data) {
+		$.get('parse_url?binurl=' + reply, function(data) {
-			//if (!editor) $j("#profile-jot-text").val("");
+			//if (!editor) $("#profile-jot-text").val("");
 			//initEditor(function(){
 			addeditortext(window.jotId, data);
-			$j('#profile-rotator').hide();
+			$('#profile-rotator').hide();
 			//});
 		});
 	}
 }*/
 
 function jotClearLocation() {
-	$j('#jot-coord').val('');
+	$('#jot-coord').val('');
-	$j('#profile-nolocation-wrapper').hide();
+	$('#profile-nolocation-wrapper').hide();
 }
 
 if(typeof window.geoTag === 'function') window.geoTag();
@@ -554,17 +554,17 @@ function confirmDelete() { return confirm(window.delItem); }
 /*function deleteCheckedItems() {
 	var checkedstr = '';
 
-	$j('.item-select').each( function() {
+	$('.item-select').each( function() {
-		if($j(this).is(':checked')) {
+		if($(this).is(':checked')) {
 			if(checkedstr.length != 0) {
-				checkedstr = checkedstr + ',' + $j(this).val();
+				checkedstr = checkedstr + ',' + $(this).val();
 			}
 			else {
-				checkedstr = $j(this).val();
+				checkedstr = $(this).val();
 			}
 		}	
 	});
-	$j.post('item', { dropitems: checkedstr }, function(data) {
+	$.post('item', { dropitems: checkedstr }, function(data) {
 		window.location.reload();
 	});
 }*/
@@ -576,9 +576,9 @@ function itemTag(id) {
 		if(reply.length) {
 
 			commentBusy = true;
-			$j('body').css('cursor', 'wait');
+			$('body').css('cursor', 'wait');
 
-			$j.get('tagger/' + id + '?term=' + reply, NavUpdate);
+			$.get('tagger/' + id + '?term=' + reply, NavUpdate);
 			/*if(timer) clearTimeout(timer);
 			timer = setTimeout(NavUpdate,3000);*/
 			liking = 1;
@@ -588,46 +588,46 @@ function itemTag(id) {
 
 function itemFiler(id) {
 	
-	$j.get('filer/', function(data){
+	$.get('filer/', function(data){
 
-		var promptText = $j('#id_term_label', data).text();
+		var promptText = $('#id_term_label', data).text();
 
 		reply = prompt(promptText);
 		if(reply && reply.length) {
 			commentBusy = true;
-			$j('body').css('cursor', 'wait');
+			$('body').css('cursor', 'wait');
-			$j.get('filer/' + id + '?term=' + reply, NavUpdate);
+			$.get('filer/' + id + '?term=' + reply, NavUpdate);
 /*				if(timer) clearTimeout(timer);
 			timer = setTimeout(NavUpdate,3000);*/
 			liking = 1;
-/*				$j.colorbox.close();*/
+/*				$.colorbox.close();*/
 		}
 	});
 
-/*		var bordercolor = $j("input").css("border-color");
+/*		var bordercolor = $("input").css("border-color");
 	
-	$j.get('filer/', function(data){
+	$.get('filer/', function(data){
-		$j.colorbox({html:data});
+		$.colorbox({html:data});
-		$j("#id_term").keypress(function(){
+		$("#id_term").keypress(function(){
-			$j(this).css("border-color",bordercolor);
+			$(this).css("border-color",bordercolor);
 		})
-		$j("#select_term").change(function(){
+		$("#select_term").change(function(){
-			$j("#id_term").css("border-color",bordercolor);
+			$("#id_term").css("border-color",bordercolor);
 		})
 		
-		$j("#filer_save").click(function(e){
+		$("#filer_save").click(function(e){
 			e.preventDefault();
-			reply = $j("#id_term").val();
+			reply = $("#id_term").val();
 			if(reply && reply.length) {
 				commentBusy = true;
-				$j('body').css('cursor', 'wait');
+				$('body').css('cursor', 'wait');
-				$j.get('filer/' + id + '?term=' + reply);
+				$.get('filer/' + id + '?term=' + reply);
 				if(timer) clearTimeout(timer);
 				timer = setTimeout(NavUpdate,3000);
 				liking = 1;
-				$j.colorbox.close();
+				$.colorbox.close();
 			} else {
-				$j("#id_term").css("border-color","#FF0000");
+				$("#id_term").css("border-color","#FF0000");
 			}
 			return false;
 		});
@@ -645,75 +645,75 @@ function itemFiler(id) {
 function commentOpen(obj,id) {
 	if(obj.value == window.commentEmptyText) {
 		obj.value = "";
-		$j("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+		$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
-		$j("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
+		$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
-		$j("#mod-cmnt-wrap-" + id).show();
+		$("#mod-cmnt-wrap-" + id).show();
 		openMenu("comment-edit-submit-wrapper-" + id);
 	}
 }
 function commentClose(obj,id) {
 	if(obj.value == "") {
 		obj.value = window.commentEmptyText;
-		$j("#comment-edit-text-" + id).removeClass("comment-edit-text-full");
+		$("#comment-edit-text-" + id).removeClass("comment-edit-text-full");
-		$j("#comment-edit-text-" + id).addClass("comment-edit-text-empty");
+		$("#comment-edit-text-" + id).addClass("comment-edit-text-empty");
-		$j("#mod-cmnt-wrap-" + id).hide();
+		$("#mod-cmnt-wrap-" + id).hide();
 		closeMenu("comment-edit-submit-wrapper-" + id);
 	}
 }
 
 
 function commentInsert(obj,id) {
-	var tmpStr = $j("#comment-edit-text-" + id).val();
+	var tmpStr = $("#comment-edit-text-" + id).val();
 	if(tmpStr == window.commentEmptyText) {
 		tmpStr = "";
-		$j("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+		$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
-		$j("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
+		$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
 		openMenu("comment-edit-submit-wrapper-" + id);
 	}
-	var ins = $j(obj).html();
+	var ins = $(obj).html();
 	ins = ins.replace("&lt;","<");
 	ins = ins.replace("&gt;",">");
 	ins = ins.replace("&amp;","&");
 	ins = ins.replace("&quot;",'"');
-	$j("#comment-edit-text-" + id).val(tmpStr + ins);
+	$("#comment-edit-text-" + id).val(tmpStr + ins);
 }
 
 function qCommentInsert(obj,id) {
-	var tmpStr = $j("#comment-edit-text-" + id).val();
+	var tmpStr = $("#comment-edit-text-" + id).val();
 	if(tmpStr == window.commentEmptyText) {
 		tmpStr = "";
-		$j("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+		$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
-		$j("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
+		$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
 		openMenu("comment-edit-submit-wrapper-" + id);
 	}
-	var ins = $j(obj).val();
+	var ins = $(obj).val();
 	ins = ins.replace("&lt;","<");
 	ins = ins.replace("&gt;",">");
 	ins = ins.replace("&amp;","&");
 	ins = ins.replace("&quot;",'"');
-	$j("#comment-edit-text-" + id).val(tmpStr + ins);
+	$("#comment-edit-text-" + id).val(tmpStr + ins);
-	$j(obj).val("");
+	$(obj).val("");
 }
 
 /*function showHideCommentBox(id) {
-	if( $j('#comment-edit-form-' + id).is(':visible')) {
+	if( $('#comment-edit-form-' + id).is(':visible')) {
-		$j('#comment-edit-form-' + id).hide();
+		$('#comment-edit-form-' + id).hide();
 	}
 	else {
-		$j('#comment-edit-form-' + id).show();
+		$('#comment-edit-form-' + id).show();
 	}
 }*/
 
 
 function insertFormatting(comment,BBcode,id) {
 	
-	var tmpStr = $j("#comment-edit-text-" + id).val();
+	var tmpStr = $("#comment-edit-text-" + id).val();
 	if(tmpStr == comment) {
 		tmpStr = "";
-		$j("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+		$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
-		$j("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
+		$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
 		openMenu("comment-edit-submit-wrapper-" + id);
-		$j("#comment-edit-text-" + id).val(tmpStr);
+		$("#comment-edit-text-" + id).val(tmpStr);
 	}
 
 	textarea = document.getElementById("comment-edit-text-" +id);
@@ -736,10 +736,10 @@ function insertFormatting(comment,BBcode,id) {
 }
 
 function cmtBbOpen(id) {
-	$j(".comment-edit-bb-" + id).show();
+	$(".comment-edit-bb-" + id).show();
 }
 function cmtBbClose(id) {
-	$j(".comment-edit-bb-" + id).hide();
+	$(".comment-edit-bb-" + id).hide();
 }
 
 

view/theme/frost-mobile/templates/admin_users.tpl

@@ -1,8 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 <script>
 	function confirm_delete(uname){
 		return confirm( "{{$confirm_delete}}".format(uname));
@@ -11,7 +6,7 @@
 		return confirm("{{$confirm_delete_multi}}");
 	}
 	function selectall(cls){
-		$j("."+cls).attr('checked','checked');
+		$("."+cls).attr('checked','checked');
 		return false;
 	}
 </script>

view/theme/frost-mobile/templates/cropbody.tpl

@@ -1,8 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 <h1>{{$title}}</h1>
 <p id="cropimage-desc">
 {{$desc}}

view/theme/frost-mobile/templates/cropend.tpl

@@ -1,8 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
       <script type="text/javascript" src="library/cropper/lib/prototype.js" language="javascript"></script>
       <script type="text/javascript" src="library/cropper/lib/scriptaculous.js?load=effects,builder,dragdrop" language="javascript"></script>
       <script type="text/javascript" src="library/cropper/cropper.js" language="javascript"></script>

view/theme/frost-mobile/templates/crophead.tpl

@@ -1,6 +1 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
       <link rel="stylesheet" href="library/cropper/cropper.css" type="text/css" />

view/theme/frost-mobile/templates/end.tpl

@@ -1,8 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 <!--[if IE]>
 <script type="text/javascript" src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
 <![endif]-->
@@ -11,7 +6,6 @@
   tinyMCE.init({ mode : "none"});
 </script>-->*}}
 <script type="text/javascript" src="{{$baseurl}}/js/jquery.js" ></script>
-<script type="text/javascript">var $j = jQuery.noConflict();</script>
 <script type="text/javascript" src="{{$baseurl}}/view/theme/frost-mobile/js/jquery.divgrow-1.3.1.f1.min.js" ></script>
 <script type="text/javascript" src="{{$baseurl}}/js/jquery.textinputs.js" ></script>
 {{*<!--<script type="text/javascript" src="{{$baseurl}}/library/fancybox/jquery.fancybox-1.3.4.pack.js"></script>

view/theme/frost-mobile/templates/field_input.tpl

@@ -1,8 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 	
 	<div class='field input' id='wrapper_{{$field.0}}'>
 		<label for='id_{{$field.0}}'>{{$field.1}}</label><br />

view/theme/frost-mobile/templates/field_openid.tpl

@@ -1,8 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 	
 	<div class='field input openid' id='wrapper_{{$field.0}}'>
 		<label for='id_{{$field.0}}'>{{$field.1}}</label><br />

view/theme/frost-mobile/templates/field_password.tpl

@@ -1,8 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 	
 	<div class='field password' id='wrapper_{{$field.0}}'>
 		<label for='id_{{$field.0}}'>{{$field.1}}</label><br />

view/theme/frost-mobile/templates/jot_geotag.tpl

@@ -1,16 +1,11 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 
 	if(navigator.geolocation) {
 		navigator.geolocation.getCurrentPosition(function(position) {
 			var lat = position.coords.latitude.toFixed(4);
 			var lon = position.coords.longitude.toFixed(4);
 
-			$j('#jot-coord').val(lat + ', ' + lon);
+			$('#jot-coord').val(lat + ', ' + lon);
-			$j('#profile-nolocation-wrapper').show();
+			$('#profile-nolocation-wrapper').show();
 		});
 	}
 

view/theme/frost-mobile/templates/settings_display_end.tpl

@@ -1,7 +1,2 @@
-{{*
+	<script>$(function(){ previewTheme($("#id_{{$theme.0}}")[0]); });</script>
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-	<script>$j(function(){ previewTheme($j("#id_{{$theme.0}}")[0]); });</script>
 

view/theme/frost-mobile/theme.php

@@ -28,6 +28,6 @@ function frost_mobile_content_loaded(&$a) {
 		$a->theme['stylesheet'] = $a->get_baseurl() . '/view/theme/frost-mobile/login-style.css';
 	}
 	if( $a->module === 'login' )
-		$a->page['end'] .= '<script type="text/javascript"> $j(document).ready(function() { $j("#id_" + window.loginName).focus();} );</script>';
+		$a->page['end'] .= '<script type="text/javascript"> $(document).ready(function() { $("#id_" + window.loginName).focus();} );</script>';
 
 }

view/theme/frost/js/acl.js

@@ -13,41 +13,41 @@ function ACL(backend_url, preset){
 	that.group_uids = [];
 	that.nw = 3; //items per row. should be calulated from #acl-list.width
 	
-	that.list_content = $j("#acl-list-content");
+	that.list_content = $("#acl-list-content");
-	that.item_tpl = unescape($j(".acl-list-item[rel=acl-template]").html());
+	that.item_tpl = unescape($(".acl-list-item[rel=acl-template]").html());
-	that.showall = $j("#acl-showall");
+	that.showall = $("#acl-showall");
 
 	if (preset.length==0) that.showall.addClass("selected");
 	
 	/*events*/
 	that.showall.click(that.on_showall);
-	$j(".acl-button-show").live('click', that.on_button_show);
+	$(".acl-button-show").live('click', that.on_button_show);
-	$j(".acl-button-hide").live('click', that.on_button_hide);
+	$(".acl-button-hide").live('click', that.on_button_hide);
-	$j("#acl-search").keypress(that.on_search);
+	$("#acl-search").keypress(that.on_search);
-	$j("#acl-wrapper").parents("form").submit(that.on_submit);
+	$("#acl-wrapper").parents("form").submit(that.on_submit);
 	
 	/* startup! */
 	that.get(0,100);
 }
 
 ACL.prototype.on_submit = function(){
-	aclfileds = $j("#acl-fields").html("");
+	aclfileds = $("#acl-fields").html("");
-	$j(that.allow_gid).each(function(i,v){
+	$(that.allow_gid).each(function(i,v){
 		aclfileds.append("<input type='hidden' name='group_allow[]' value='"+v+"'>");
 	});
-	$j(that.allow_cid).each(function(i,v){
+	$(that.allow_cid).each(function(i,v){
 		aclfileds.append("<input type='hidden' name='contact_allow[]' value='"+v+"'>");
 	});
-	$j(that.deny_gid).each(function(i,v){
+	$(that.deny_gid).each(function(i,v){
 		aclfileds.append("<input type='hidden' name='group_deny[]' value='"+v+"'>");
 	});
-	$j(that.deny_cid).each(function(i,v){
+	$(that.deny_cid).each(function(i,v){
 		aclfileds.append("<input type='hidden' name='contact_deny[]' value='"+v+"'>");
 	});	
 }
 
 ACL.prototype.search = function(){
-	var srcstr = $j("#acl-search").val();
+	var srcstr = $("#acl-search").val();
 	that.list_content.html("");
 	that.get(0,100, srcstr);
 }
@@ -82,10 +82,10 @@ ACL.prototype.on_button_show = function(event){
 	event.stopPropagation();
 
 	/*that.showall.removeClass("selected");
-	$j(this).siblings(".acl-button-hide").removeClass("selected");
+	$(this).siblings(".acl-button-hide").removeClass("selected");
-	$j(this).toggleClass("selected");*/
+	$(this).toggleClass("selected");*/
 
-	that.set_allow($j(this).parent().attr('id'));
+	that.set_allow($(this).parent().attr('id'));
 
 	return false;
 }
@@ -95,10 +95,10 @@ ACL.prototype.on_button_hide = function(event){
 	event.stopPropagation();
 
 	/*that.showall.removeClass("selected");
-	$j(this).siblings(".acl-button-show").removeClass("selected");
+	$(this).siblings(".acl-button-show").removeClass("selected");
-	$j(this).toggleClass("selected");*/
+	$(this).toggleClass("selected");*/
 
-	that.set_deny($j(this).parent().attr('id'));
+	that.set_deny($(this).parent().attr('id'));
 
 	return false;
 }
@@ -156,32 +156,32 @@ ACL.prototype.update_view = function(){
 		that.deny_gid.length==0 && that.deny_cid.length==0){
 			that.showall.addClass("selected");
 			/* jot acl */
-				$j('#jot-perms-icon').removeClass('lock').addClass('unlock');
+				$('#jot-perms-icon').removeClass('lock').addClass('unlock');
-				$j('#jot-public').show();
+				$('#jot-public').show();
-				$j('.profile-jot-net input').attr('disabled', false);			
+				$('.profile-jot-net input').attr('disabled', false);			
 				if(typeof editor != 'undefined' && editor != false) {
-					$j('#profile-jot-desc').html(window.isPublic);
+					$('#profile-jot-desc').html(window.isPublic);
 				}
 			
 	} else {
 			that.showall.removeClass("selected");
 			/* jot acl */
-				$j('#jot-perms-icon').removeClass('unlock').addClass('lock');
+				$('#jot-perms-icon').removeClass('unlock').addClass('lock');
-				$j('#jot-public').hide();
+				$('#jot-public').hide();
-				$j('.profile-jot-net input').attr('disabled', 'disabled');			
+				$('.profile-jot-net input').attr('disabled', 'disabled');			
-				$j('#profile-jot-desc').html('&nbsp;');
+				$('#profile-jot-desc').html('&nbsp;');
 	}
-	$j("#acl-list-content .acl-list-item").each(function(){
+	$("#acl-list-content .acl-list-item").each(function(){
-		$j(this).removeClass("groupshow grouphide");
+		$(this).removeClass("groupshow grouphide");
 	});
 	
-	$j("#acl-list-content .acl-list-item").each(function(){
+	$("#acl-list-content .acl-list-item").each(function(){
-		itemid = $j(this).attr('id');
+		itemid = $(this).attr('id');
 		type = itemid[0];
 		id 	 = parseInt(itemid.substr(1));
 		
-		btshow = $j(this).children(".acl-button-show").removeClass("selected");
+		btshow = $(this).children(".acl-button-show").removeClass("selected");
-		bthide = $j(this).children(".acl-button-hide").removeClass("selected");	
+		bthide = $(this).children(".acl-button-hide").removeClass("selected");	
 		
 		switch(type){
 			case "g":
@@ -197,16 +197,16 @@ ACL.prototype.update_view = function(){
 					uclass="grouphide";
 				}
 				
-				$j(that.group_uids[id]).each(function(i,v) {
+				$(that.group_uids[id]).each(function(i,v) {
 					if(uclass == "grouphide")
-						$j("#c"+v).removeClass("groupshow");
+						$("#c"+v).removeClass("groupshow");
 					if(uclass != "") {
-						var cls = $j("#c"+v).attr('class');
+						var cls = $("#c"+v).attr('class');
 						if( cls == undefined)
 							return true;
 						var hiding = cls.indexOf('grouphide');
 						if(hiding == -1)
-							$j("#c"+v).addClass(uclass);
+							$("#c"+v).addClass(uclass);
 					}
 				});
 				
@@ -234,7 +234,7 @@ ACL.prototype.get = function(start,count, search){
 		search:search,
 	}
 	
-	$j.ajax({
+	$.ajax({
 		type:'POST',
 		url: that.url,
 		data: postdata,
@@ -246,16 +246,16 @@ ACL.prototype.get = function(start,count, search){
 ACL.prototype.populate = function(data){
 	var height = Math.ceil(data.tot / that.nw) * 42;
 	that.list_content.height(height);
-	$j(data.items).each(function(){
+	$(data.items).each(function(){
 		html = "<div class='acl-list-item {4} {5}' title='{6}' id='{2}{3}'>"+that.item_tpl+"</div>";
 		html = html.format( this.photo, this.name, this.type, this.id, '', this.network, this.link );
 		if (this.uids!=undefined) that.group_uids[this.id] = this.uids;
 		//console.log(html);
 		that.list_content.append(html);
 	});
-	$j(".acl-list-item img[data-src]", that.list_content).each(function(i, el){
+	$(".acl-list-item img[data-src]", that.list_content).each(function(i, el){
 		// Add src attribute for images with a data-src attribute
-		$j(el).attr('src', $j(el).data("src"));
+		$(el).attr('src', $(el).data("src"));
 	});
 	that.update_view();
 }

view/theme/frost/js/main.js

@@ -10,13 +10,13 @@
 		listID = listID.replace(/\./g, "\\.");
 		listID = listID.replace(/@/g, "\\@");
 
-		if($j(listID).is(":visible")) {
+		if($(listID).is(":visible")) {
-			$j(listID).hide();
+			$(listID).hide();
-			$j(listID+"-wrapper").show();
+			$(listID+"-wrapper").show();
 		}
 		else {
-			$j(listID).show();
+			$(listID).show();
-			$j(listID+"-wrapper").hide();
+			$(listID+"-wrapper").hide();
 		}
 	}
 
@@ -45,16 +45,16 @@
 	var last_popup_menu = null;
 	var last_popup_button = null;
 
-	$j(function() {
+	$(function() {
-		$j.ajaxSetup({cache: false});
+		$.ajaxSetup({cache: false});
 
-		msie = $j.browser.msie ;
+		msie = $.browser.msie ;
 		
 		collapseHeight();
 		
 		/* setup tooltips *//*
-		$j("a,.tt").each(function(){
+		$("a,.tt").each(function(){
-			var e = $j(this);
+			var e = $(this);
 			var pos="bottom";
 			if (e.hasClass("tttop")) pos="top";
 			if (e.hasClass("ttbottom")) pos="bottom";
@@ -66,19 +66,19 @@
 		
 		
 		/* setup onoff widgets */
-		$j(".onoff input").each(function(){
+		$(".onoff input").each(function(){
-			val = $j(this).val();
+			val = $(this).val();
-			id = $j(this).attr("id");
+			id = $(this).attr("id");
-			$j("#"+id+"_onoff ."+ (val==0?"on":"off")).addClass("hidden");
+			$("#"+id+"_onoff ."+ (val==0?"on":"off")).addClass("hidden");
 			
 		});
-		$j(".onoff > a").click(function(event){
+		$(".onoff > a").click(function(event){
 			event.preventDefault();	
-			var input = $j(this).siblings("input");
+			var input = $(this).siblings("input");
 			var val = 1-input.val();
 			var id = input.attr("id");
-			$j("#"+id+"_onoff ."+ (val==0?"on":"off")).addClass("hidden");
+			$("#"+id+"_onoff ."+ (val==0?"on":"off")).addClass("hidden");
-			$j("#"+id+"_onoff ."+ (val==1?"on":"off")).removeClass("hidden");
+			$("#"+id+"_onoff ."+ (val==1?"on":"off")).removeClass("hidden");
 			input.val(val);
 			//console.log(id);
 		});
@@ -90,7 +90,7 @@
 		function close_last_popup_menu(e) {
 
  			if( last_popup_menu ) {
-				if( '#' + last_popup_menu.attr('id') !== $j(e.target).attr('rel')) {
+				if( '#' + last_popup_menu.attr('id') !== $(e.target).attr('rel')) {
 		 			last_popup_menu.hide();
 		 			last_popup_button.removeClass("selected");
 		 			last_popup_menu = null;
@@ -98,16 +98,16 @@
 				}
 			}
 		}
-		$j('a[rel^=#]').click(function(e){
+		$('a[rel^=#]').click(function(e){
 
 			close_last_popup_menu(e);
-			menu = $j( $j(this).attr('rel') );
+			menu = $( $(this).attr('rel') );
 			e.preventDefault();
 			e.stopPropagation();
 
 			if (menu.attr('popup')=="false") return false;
 
-			$j(this).parent().toggleClass("selected");
+			$(this).parent().toggleClass("selected");
 			menu.slideToggle('fast');
 
 			if (menu.css("display") == "none") {
@@ -115,97 +115,97 @@
 				last_popup_button = null;
 			} else {
 				last_popup_menu = menu;
-				last_popup_button = $j(this).parent();
+				last_popup_button = $(this).parent();
 			}
 			return false;
 		});
-		$j('html').click(function(e) {
+		$('html').click(function(e) {
 			close_last_popup_menu(e);
 		});
 		
 		// fancyboxes
-		$j("a.popupbox").colorbox({
+		$("a.popupbox").colorbox({
 			'inline' : true,
 			'transition' : 'elastic'
 		});
 		
 
 		/* notifications template */
-		var notifications_tpl= unescape($j("#nav-notifications-template[rel=template]").html());
+		var notifications_tpl= unescape($("#nav-notifications-template[rel=template]").html());
-		var notifications_all = unescape($j('<div>').append( $j("#nav-notifications-see-all").clone() ).html()); //outerHtml hack
+		var notifications_all = unescape($('<div>').append( $("#nav-notifications-see-all").clone() ).html()); //outerHtml hack
-		var notifications_mark = unescape($j('<div>').append( $j("#nav-notifications-mark-all").clone() ).html()); //outerHtml hack
+		var notifications_mark = unescape($('<div>').append( $("#nav-notifications-mark-all").clone() ).html()); //outerHtml hack
-		var notifications_empty = unescape($j("#nav-notifications-menu").html());
+		var notifications_empty = unescape($("#nav-notifications-menu").html());
 		
 		/* nav update event  */
-		$j('nav').bind('nav-update', function(e,data){;
+		$('nav').bind('nav-update', function(e,data){;
-			var invalid = $j(data).find('invalid').text();
+			var invalid = $(data).find('invalid').text();
 			if(invalid == 1) { window.location.href=window.location.href }
 
-			var net = $j(data).find('net').text();
+			var net = $(data).find('net').text();
-			if(net == 0) { net = ''; $j('#net-update').removeClass('show') } else { $j('#net-update').addClass('show') }
+			if(net == 0) { net = ''; $('#net-update').removeClass('show') } else { $('#net-update').addClass('show') }
-			$j('#net-update').html(net);
+			$('#net-update').html(net);
 
-			var home = $j(data).find('home').text();
+			var home = $(data).find('home').text();
-			if(home == 0) { home = '';  $j('#home-update').removeClass('show') } else { $j('#home-update').addClass('show') }
+			if(home == 0) { home = '';  $('#home-update').removeClass('show') } else { $('#home-update').addClass('show') }
-			$j('#home-update').html(home);
+			$('#home-update').html(home);
 			
-			var intro = $j(data).find('intro').text();
+			var intro = $(data).find('intro').text();
-			if(intro == 0) { intro = '';  $j('#intro-update').removeClass('show') } else { $j('#intro-update').addClass('show') }
+			if(intro == 0) { intro = '';  $('#intro-update').removeClass('show') } else { $('#intro-update').addClass('show') }
-			$j('#intro-update').html(intro);
+			$('#intro-update').html(intro);
 
-			var mail = $j(data).find('mail').text();
+			var mail = $(data).find('mail').text();
-			if(mail == 0) { mail = '';  $j('#mail-update').removeClass('show') } else { $j('#mail-update').addClass('show') }
+			if(mail == 0) { mail = '';  $('#mail-update').removeClass('show') } else { $('#mail-update').addClass('show') }
-			$j('#mail-update').html(mail);
+			$('#mail-update').html(mail);
 			
-			var intro = $j(data).find('intro').text();
+			var intro = $(data).find('intro').text();
-			if(intro == 0) { intro = '';  $j('#intro-update-li').removeClass('show') } else { $j('#intro-update-li').addClass('show') }
+			if(intro == 0) { intro = '';  $('#intro-update-li').removeClass('show') } else { $('#intro-update-li').addClass('show') }
-			$j('#intro-update-li').html(intro);
+			$('#intro-update-li').html(intro);
 
-			var mail = $j(data).find('mail').text();
+			var mail = $(data).find('mail').text();
-			if(mail == 0) { mail = '';  $j('#mail-update-li').removeClass('show') } else { $j('#mail-update-li').addClass('show') }
+			if(mail == 0) { mail = '';  $('#mail-update-li').removeClass('show') } else { $('#mail-update-li').addClass('show') }
-			$j('#mail-update-li').html(mail);
+			$('#mail-update-li').html(mail);
 
-			var eNotif = $j(data).find('notif')
+			var eNotif = $(data).find('notif')
 			
 			if (eNotif.children("note").length==0){
-				$j("#nav-notifications-menu").html(notifications_empty);
+				$("#nav-notifications-menu").html(notifications_empty);
 			} else {
-				nnm = $j("#nav-notifications-menu");
+				nnm = $("#nav-notifications-menu");
 				nnm.html(notifications_all + notifications_mark);
 				//nnm.attr('popup','true');
 				eNotif.children("note").each(function(){
-					e = $j(this);
+					e = $(this);
 					text = e.text().format("<span class='contactname'>"+e.attr('name')+"</span>");
 					html = notifications_tpl.format(e.attr('href'),e.attr('photo'), text, e.attr('date'), e.attr('seen'));
 					nnm.append(html);
 				});
 
-				$j("img[data-src]", nnm).each(function(i, el){
+				$("img[data-src]", nnm).each(function(i, el){
 					// Add src attribute for images with a data-src attribute
 					// However, don't bother if the data-src attribute is empty, because
 					// an empty "src" tag for an image will cause some browsers
 					// to prefetch the root page of the Friendica hub, which will
 					// unnecessarily load an entire profile/ or network/ page
-					if($j(el).data("src") != '') $j(el).attr('src', $j(el).data("src"));
+					if($(el).data("src") != '') $(el).attr('src', $(el).data("src"));
 				});
 			}
 			notif = eNotif.attr('count');
 			if (notif>0){
-				$j("#nav-notifications-linkmenu").addClass("on");
+				$("#nav-notifications-linkmenu").addClass("on");
 			} else {
-				$j("#nav-notifications-linkmenu").removeClass("on");
+				$("#nav-notifications-linkmenu").removeClass("on");
 			}
-			if(notif == 0) { notif = ''; $j('#notify-update').removeClass('show') } else { $j('#notify-update').addClass('show') }
+			if(notif == 0) { notif = ''; $('#notify-update').removeClass('show') } else { $('#notify-update').addClass('show') }
-			$j('#notify-update').html(notif);
+			$('#notify-update').html(notif);
 			
-			var eSysmsg = $j(data).find('sysmsgs');
+			var eSysmsg = $(data).find('sysmsgs');
 			eSysmsg.children("notice").each(function(){
-				text = $j(this).text();
+				text = $(this).text();
-				$j.jGrowl(text, { sticky: false, theme: 'notice', life: 3000 }); // originally: sticky: true,
+				$.jGrowl(text, { sticky: false, theme: 'notice', life: 3000 }); // originally: sticky: true,
 			});
 			eSysmsg.children("info").each(function(){
-				text = $j(this).text();
+				text = $(this).text();
-				$j.jGrowl(text, { sticky: false, theme: 'info', life: 1000 });
+				$.jGrowl(text, { sticky: false, theme: 'info', life: 1000 });
 			});
 			
 		});
@@ -213,7 +213,7 @@
 		
  		NavUpdate(); 
 		// Allow folks to stop the ajax page updates with the pause/break key
-		$j(document).keydown(function(event) {
+		$(document).keydown(function(event) {
 			if(event.keyCode == '8') {
 				var target = event.target || event.srcElement;
 				if (!/input|textarea/i.test(target.nodeName)) {
@@ -227,7 +227,7 @@
 					if (event.ctrlKey) {
 						totStopped = true;
 					}
-					$j('#pause').html('<img src="images/pause.gif" alt="pause" style="border: 1px solid black;" />');
+					$('#pause').html('<img src="images/pause.gif" alt="pause" style="border: 1px solid black;" />');
 				} else {
 					unpause();
 				}
@@ -245,28 +245,28 @@
 
 		if(! stopped) {
 			var pingCmd = 'ping' + ((localUser != 0) ? '?f=&uid=' + localUser : '');
-			$j.get(pingCmd,function(data) {
+			$.get(pingCmd,function(data) {
-				$j(data).find('result').each(function() {
+				$(data).find('result').each(function() {
 					// send nav-update event
-					$j('nav').trigger('nav-update', this);
+					$('nav').trigger('nav-update', this);
 					
 					
 					// start live update
 
 					
 
-					if($j('#live-network').length)   { src = 'network'; liveUpdate(); }
+					if($('#live-network').length)   { src = 'network'; liveUpdate(); }
-					if($j('#live-profile').length)   { src = 'profile'; liveUpdate(); }
+					if($('#live-profile').length)   { src = 'profile'; liveUpdate(); }
-					if($j('#live-community').length) { src = 'community'; liveUpdate(); }
+					if($('#live-community').length) { src = 'community'; liveUpdate(); }
-					if($j('#live-notes').length)     { src = 'notes'; liveUpdate(); }
+					if($('#live-notes').length)     { src = 'notes'; liveUpdate(); }
-					if($j('#live-display').length) { src = 'display'; liveUpdate(); }
+					if($('#live-display').length) { src = 'display'; liveUpdate(); }
-					/*if($j('#live-display').length) {
+					/*if($('#live-display').length) {
 						if(liking) {
 							liking = 0;
 							window.location.href=window.location.href 
 						}
 					}*/
-					if($j('#live-photos').length) {
+					if($('#live-photos').length) {
 						if(liking) {
 							liking = 0;
 							window.location.href=window.location.href 
@@ -283,8 +283,8 @@
 	}
 
 	function liveUpdate() {
-		if((src == null) || (stopped) || (typeof profile_uid == 'undefined') || (! profile_uid)) { $j('.like-rotator').hide(); return; }
+		if((src == null) || (stopped) || (typeof profile_uid == 'undefined') || (! profile_uid)) { $('.like-rotator').hide(); return; }
-		if(($j('.comment-edit-text-full').length) || (in_progress)) {
+		if(($('.comment-edit-text-full').length) || (in_progress)) {
 			if(livetime) {
 				clearTimeout(livetime);
 			}
@@ -300,55 +300,55 @@
 		var udargs = ((netargs.length) ? '/' + netargs : '');
 		var update_url = 'update_' + src + udargs + '&p=' + profile_uid + '&page=' + profile_page + '&msie=' + ((msie) ? 1 : 0);
 
-		$j.get(update_url,function(data) {
+		$.get(update_url,function(data) {
 			in_progress = false;
-			//			$j('.collapsed-comments',data).each(function() {
+			//			$('.collapsed-comments',data).each(function() {
-			//	var ident = $j(this).attr('id');
+			//	var ident = $(this).attr('id');
-			//	var is_hidden = $j('#' + ident).is(':hidden');
+			//	var is_hidden = $('#' + ident).is(':hidden');
-			//	if($j('#' + ident).length) {
+			//	if($('#' + ident).length) {
-			//		$j('#' + ident).replaceWith($j(this));
+			//		$('#' + ident).replaceWith($(this));
 			//		if(is_hidden)
-			//			$j('#' + ident).hide();
+			//			$('#' + ident).hide();
 			//	}
 			//});
 
 			// add a new thread
 
-			$j('.toplevel_item',data).each(function() {
+			$('.toplevel_item',data).each(function() {
-				var ident = $j(this).attr('id');
+				var ident = $(this).attr('id');
 
-				if($j('#' + ident).length == 0 && profile_page == 1) {
+				if($('#' + ident).length == 0 && profile_page == 1) {
-					$j('img',this).each(function() {
+					$('img',this).each(function() {
-						$j(this).attr('src',$j(this).attr('dst'));
+						$(this).attr('src',$(this).attr('dst'));
 					});
-					$j('#' + prev).after($j(this));
+					$('#' + prev).after($(this));
 				}
 				else {
 					// Find out if the hidden comments are open, so we can keep it that way
 					// if a new comment has been posted
-					var id = $j('.hide-comments-total', this).attr('id');
+					var id = $('.hide-comments-total', this).attr('id');
 					if(typeof id != 'undefined') {
 						id = id.split('-')[3];
-						var commentsOpen = $j("#collapsed-comments-" + id).is(":visible");
+						var commentsOpen = $("#collapsed-comments-" + id).is(":visible");
 					}
 
-					$j('img',this).each(function() {
+					$('img',this).each(function() {
-						$j(this).attr('src',$j(this).attr('dst'));
+						$(this).attr('src',$(this).attr('dst'));
 					});
-					//vScroll = $j(document).scrollTop();
+					//vScroll = $(document).scrollTop();
-					$j('html').height($j('html').height());
+					$('html').height($('html').height());
-					$j('#' + ident).replaceWith($j(this));
+					$('#' + ident).replaceWith($(this));
 
 					if(typeof id != 'undefined') {
 						if(commentsOpen) showHideComments(id);
 					}
-					$j('html').height('auto');
+					$('html').height('auto');
-					//$j(document).scrollTop(vScroll);
+					//$(document).scrollTop(vScroll);
 				}
 
 				// Add Colorbox for viewing Network page images
-				$j("#" + ident + " .wall-item-body a img").each(function(){
+				$("#" + ident + " .wall-item-body a img").each(function(){
-					var aElem = $j(this).parent();
+					var aElem = $(this).parent();
 					var imgHref = aElem.attr("href");
 
 					// We need to make sure we only put a Colorbox on links to Friendica images
@@ -358,8 +358,8 @@
 					if(imgHref.match(/\/photo\/[a-fA-F0-9]+(-[0-9]\.[\w]+?)?$/)) {
 
 						// Add a unique class to all the images of a certain post, to allow scrolling through
-						var cBoxClass = $j(this).closest(".wall-item-body").attr("id") + "-lightbox";
+						var cBoxClass = $(this).closest(".wall-item-body").attr("id") + "-lightbox";
-						$j(this).addClass(cBoxClass);
+						$(this).addClass(cBoxClass);
 
 						aElem.colorbox({
 							maxHeight: '90%',
@@ -376,36 +376,36 @@
 
 			/*prev = 'live-' + src;
 
-			$j('.wall-item-outside-wrapper',data).each(function() {
+			$('.wall-item-outside-wrapper',data).each(function() {
-				var ident = $j(this).attr('id');
+				var ident = $(this).attr('id');
 
-				if($j('#' + ident).length == 0 && prev != 'live-' + src) {
+				if($('#' + ident).length == 0 && prev != 'live-' + src) {
-						$j('img',this).each(function() {
+						$('img',this).each(function() {
-							$j(this).attr('src',$j(this).attr('dst'));
+							$(this).attr('src',$(this).attr('dst'));
 						});
-						$j('#' + prev).after($j(this));
+						$('#' + prev).after($(this));
 				}
 				else { 
-					$j('#' + ident + ' ' + '.wall-item-ago').replaceWith($j(this).find('.wall-item-ago')); 
+					$('#' + ident + ' ' + '.wall-item-ago').replaceWith($(this).find('.wall-item-ago')); 
-					if($j('#' + ident + ' ' + '.comment-edit-text-empty').length)
+					if($('#' + ident + ' ' + '.comment-edit-text-empty').length)
-						$j('#' + ident + ' ' + '.wall-item-comment-wrapper').replaceWith($j(this).find('.wall-item-comment-wrapper'));
+						$('#' + ident + ' ' + '.wall-item-comment-wrapper').replaceWith($(this).find('.wall-item-comment-wrapper'));
-					$j('#' + ident + ' ' + '.hide-comments-total').replaceWith($j(this).find('.hide-comments-total'));
+					$('#' + ident + ' ' + '.hide-comments-total').replaceWith($(this).find('.hide-comments-total'));
-					$j('#' + ident + ' ' + '.wall-item-like').replaceWith($j(this).find('.wall-item-like'));
+					$('#' + ident + ' ' + '.wall-item-like').replaceWith($(this).find('.wall-item-like'));
-					$j('#' + ident + ' ' + '.wall-item-dislike').replaceWith($j(this).find('.wall-item-dislike'));
+					$('#' + ident + ' ' + '.wall-item-dislike').replaceWith($(this).find('.wall-item-dislike'));
-					$j('#' + ident + ' ' + '.my-comment-photo').each(function() {
+					$('#' + ident + ' ' + '.my-comment-photo').each(function() {
-						$j(this).attr('src',$j(this).attr('dst'));
+						$(this).attr('src',$(this).attr('dst'));
 					});
 				}
 				prev = ident; 
 			});*/
 			
-			$j('.like-rotator').hide();
+			$('.like-rotator').hide();
 			if(commentBusy) {
 				commentBusy = false;
-				$j('body').css('cursor', 'auto');
+				$('body').css('cursor', 'auto');
 			}
 			/* autocomplete @nicknames */
-			$j(".comment-edit-form  textarea").contact_autocomplete(baseurl+"/acl");
+			$(".comment-edit-form  textarea").contact_autocomplete(baseurl+"/acl");
 		
 			collapseHeight();
 
@@ -419,22 +419,22 @@
 		if(typeof elems != 'undefined') {
 			elemName = elems + ' ' + elemName;
 		}
-		$j(elemName).each(function() {
+		$(elemName).each(function() {
-			if($j(this).height() > 450) {
+			if($(this).height() > 450) {
-				$j('html').height($j('html').height());
+				$('html').height($('html').height());
-				$j(this).divgrow({ initialHeight: 400, showBrackets: false, speed: 0 });
+				$(this).divgrow({ initialHeight: 400, showBrackets: false, speed: 0 });
-				$j(this).addClass('divmore');
+				$(this).addClass('divmore');
-				$j('html').height('auto');
+				$('html').height('auto');
 			}					
 		});
 	}
 
 	/*function imgbright(node) {
-		$j(node).removeClass("drophide").addClass("drop");
+		$(node).removeClass("drophide").addClass("drop");
 	}
 
 	function imgdull(node) {
-		$j(node).removeClass("drop").addClass("drophide");
+		$(node).removeClass("drop").addClass("drophide");
 	}*/
 
 	// Since our ajax calls are asynchronous, we will give a few 
@@ -449,28 +449,28 @@
 
 	function dolike(ident,verb) {
 		unpause();
-		$j('#like-rotator-' + ident.toString()).show();
+		$('#like-rotator-' + ident.toString()).show();
-		$j.get('like/' + ident.toString() + '?verb=' + verb, NavUpdate );
+		$.get('like/' + ident.toString() + '?verb=' + verb, NavUpdate );
 		liking = 1;
 	}
 
 	function dostar(ident) {
 		ident = ident.toString();
-//		$j('#like-rotator-' + ident).show();
+//		$('#like-rotator-' + ident).show();
-		$j.get('starred/' + ident, function(data) {
+		$.get('starred/' + ident, function(data) {
 			if(data.match(/1/)) {
-				$j('#starred-' + ident).addClass('starred');
+				$('#starred-' + ident).addClass('starred');
-				$j('#starred-' + ident).removeClass('unstarred');
+				$('#starred-' + ident).removeClass('unstarred');
-				$j('#star-' + ident).addClass('hidden');
+				$('#star-' + ident).addClass('hidden');
-				$j('#unstar-' + ident).removeClass('hidden');
+				$('#unstar-' + ident).removeClass('hidden');
 			}
 			else {			
-				$j('#starred-' + ident).addClass('unstarred');
+				$('#starred-' + ident).addClass('unstarred');
-				$j('#starred-' + ident).removeClass('starred');
+				$('#starred-' + ident).removeClass('starred');
-				$j('#star-' + ident).removeClass('hidden');
+				$('#star-' + ident).removeClass('hidden');
-				$j('#unstar-' + ident).addClass('hidden');
+				$('#unstar-' + ident).addClass('hidden');
 			}
-//			$j('#like-rotator-' + ident).hide();	
+//			$('#like-rotator-' + ident).hide();	
 		});
 	}
 
@@ -505,31 +505,31 @@
 		}
 		else {
 			lockvisible = true;
-			$j.get('lockview/' + id, function(data) {
+			$.get('lockview/' + id, function(data) {
-				$j('#panel').html(data);
+				$('#panel').html(data);
-				$j('#panel').css({ 'left': cursor.x + 5 , 'top': cursor.y + 5});
+				$('#panel').css({ 'left': cursor.x + 5 , 'top': cursor.y + 5});
-				$j('#panel').show();
+				$('#panel').show();
 			});
 		}
 	}
 
 	function lockviewhide() {
 		lockvisible = false;
-		$j('#panel').hide();
+		$('#panel').hide();
 	}
 
 	function post_comment(id) {
 		unpause();
 		commentBusy = true;
-		$j('body').css('cursor', 'wait');
+		$('body').css('cursor', 'wait');
-		$j("#comment-preview-inp-" + id).val("0");
+		$("#comment-preview-inp-" + id).val("0");
-		$j.post(  
+		$.post(  
              "item",  
-             $j("#comment-edit-form-" + id).serialize(),
+             $("#comment-edit-form-" + id).serialize(),
 			function(data) {
 				if(data.success) {
-					$j("#comment-edit-wrapper-" + id).hide();
+					$("#comment-edit-wrapper-" + id).hide();
-					$j("#comment-edit-text-" + id).val('');
+					$("#comment-edit-text-" + id).val('');
     	  			var tarea = document.getElementById("comment-edit-text-" + id);
 					if(tarea)
 						commentClose(tarea,id);
@@ -547,16 +547,16 @@
 
 
 	function preview_comment(id) {
-		$j("#comment-preview-inp-" + id).val("1");
+		$("#comment-preview-inp-" + id).val("1");
-		$j("#comment-edit-preview-" + id).show();
+		$("#comment-edit-preview-" + id).show();
-		$j.post(  
+		$.post(  
              "item",  
-             $j("#comment-edit-form-" + id).serialize(),
+             $("#comment-edit-form-" + id).serialize(),
 			function(data) {
 				if(data.preview) {
 						
-					$j("#comment-edit-preview-" + id).html(data.preview);
+					$("#comment-edit-preview-" + id).html(data.preview);
-					$j("#comment-edit-preview-" + id + " a").click(function() { return false; });
+					$("#comment-edit-preview-" + id + " a").click(function() { return false; });
 				}
 			},
 			"json"  
@@ -566,34 +566,34 @@
 
 
 	function showHideComments(id) {
-		if( $j("#collapsed-comments-" + id).is(":visible")) {
+		if( $("#collapsed-comments-" + id).is(":visible")) {
-			$j("#collapsed-comments-" + id).hide();
+			$("#collapsed-comments-" + id).hide();
-			$j("#hide-comments-" + id).html(window.showMore);
+			$("#hide-comments-" + id).html(window.showMore);
 		}
 		else {
-			$j("#collapsed-comments-" + id).show();
+			$("#collapsed-comments-" + id).show();
-			$j("#hide-comments-" + id).html(window.showFewer);
+			$("#hide-comments-" + id).html(window.showFewer);
 			collapseHeight("#collapsed-comments-" + id);
 		}
 	}
 
 
 	function preview_post() {
-		$j("#jot-preview").val("1");
+		$("#jot-preview").val("1");
-		$j("#jot-preview-content").show();
+		$("#jot-preview-content").show();
 		tinyMCE.triggerSave();
-		$j.post(  
+		$.post(  
 			"item",  
-			$j("#profile-jot-form").serialize(),
+			$("#profile-jot-form").serialize(),
 			function(data) {
 				if(data.preview) {			
-					$j("#jot-preview-content").html(data.preview);
+					$("#jot-preview-content").html(data.preview);
-					$j("#jot-preview-content" + " a").click(function() { return false; });
+					$("#jot-preview-content" + " a").click(function() { return false; });
 				}
 			},
 			"json"  
 		);  
-		$j("#jot-preview").val("0");
+		$("#jot-preview").val("0");
 		return true;  
 	}
 
@@ -602,7 +602,7 @@
 		// unpause auto reloads if they are currently stopped
 		totStopped = false;
 		stopped = false;
-	    $j('#pause').html('');
+	    $('#pause').html('');
 	}
 		
 
@@ -630,40 +630,40 @@
     }  
 
 	function groupChangeMember(gid, cid, sec_token) {
-		$j('body .fakelink').css('cursor', 'wait');
+		$('body .fakelink').css('cursor', 'wait');
-		$j.get('group/' + gid + '/' + cid + "?t=" + sec_token, function(data) {
+		$.get('group/' + gid + '/' + cid + "?t=" + sec_token, function(data) {
-				$j('#group-update-wrapper').html(data);
+				$('#group-update-wrapper').html(data);
-				$j('body .fakelink').css('cursor', 'auto');				
+				$('body .fakelink').css('cursor', 'auto');				
 		});
 	}
 
 	function profChangeMember(gid,cid) {
-		$j('body .fakelink').css('cursor', 'wait');
+		$('body .fakelink').css('cursor', 'wait');
-		$j.get('profperm/' + gid + '/' + cid, function(data) {
+		$.get('profperm/' + gid + '/' + cid, function(data) {
-				$j('#prof-update-wrapper').html(data);
+				$('#prof-update-wrapper').html(data);
-				$j('body .fakelink').css('cursor', 'auto');				
+				$('body .fakelink').css('cursor', 'auto');				
 		});
 	}
 
 	function contactgroupChangeMember(gid,cid) {
-		$j('body').css('cursor', 'wait');
+		$('body').css('cursor', 'wait');
-		$j.get('contactgroup/' + gid + '/' + cid, function(data) {
+		$.get('contactgroup/' + gid + '/' + cid, function(data) {
-				$j('body').css('cursor', 'auto');
+				$('body').css('cursor', 'auto');
 		});
 	}
 
 
 function checkboxhighlight(box) {
-  if($j(box).is(':checked')) {
+  if($(box).is(':checked')) {
-	$j(box).addClass('checkeditem');
+	$(box).addClass('checkeditem');
   }
   else {
-	$j(box).removeClass('checkeditem');
+	$(box).removeClass('checkeditem');
   }
 }
 
 function notifyMarkAll() {
-	$j.get('notify/mark/all', function(data) {
+	$.get('notify/mark/all', function(data) {
 		if(timer) clearTimeout(timer);
 		timer = setTimeout(NavUpdate,1000);
 	});
@@ -742,9 +742,9 @@ Array.prototype.remove = function(item) {
 };
 
 function previewTheme(elm) {
-	theme = $j(elm).val();
+	theme = $(elm).val();
-	$j.getJSON('pretheme?f=&theme=' + theme,function(data) {
+	$.getJSON('pretheme?f=&theme=' + theme,function(data) {
-			$j('#theme-preview').html('<div id="theme-desc">' + data.desc + '</div><div id="theme-version">' + data.version + '</div><div id="theme-credits">' + data.credits + '</div><a href="' + data.img + '"><img src="' + data.img + '" width="320" height="240" alt="' + theme + '" /></a>');
+			$('#theme-preview').html('<div id="theme-desc">' + data.desc + '</div><div id="theme-version">' + data.version + '</div><div id="theme-credits">' + data.credits + '</div><a href="' + data.img + '"><img src="' + data.img + '" width="320" height="240" alt="' + theme + '" /></a>');
 	});
 
 }

view/theme/frost/js/theme.js

@@ -1,4 +1,4 @@
-$j(document).ready(function() {
+$(document).ready(function() {
 
 	window.navMenuTimeout = {
 		'#network-menu-list-timeout': null,
@@ -12,83 +12,83 @@ $j(document).ready(function() {
 		'#system-menu-list-closing': false
 	};
 
-/*    $j.ajaxSetup({ 
+/*    $.ajaxSetup({ 
         cache: false 
     });*/
 
 
 	/* enable tinymce on focus and click */
-	$j("#profile-jot-text").focus(enableOnUser);
+	$("#profile-jot-text").focus(enableOnUser);
-	$j("#profile-jot-text").click(enableOnUser);
+	$("#profile-jot-text").click(enableOnUser);
 
-	$j('.nav-menu-list, .nav-menu-icon').hover(function() {
+	$('.nav-menu-list, .nav-menu-icon').hover(function() {
-		showNavMenu($j(this).attr('point'));
+		showNavMenu($(this).attr('point'));
 	}, function() {
-		hideNavMenu($j(this).attr('point'));
+		hideNavMenu($(this).attr('point'));
 	});
 
-/*	$j('html').click(function() { $j("#nav-notifications-menu" ).hide(); });*/
+/*	$('html').click(function() { $("#nav-notifications-menu" ).hide(); });*/
 
-	$j('.group-edit-icon').hover(
+	$('.group-edit-icon').hover(
 		function() {
-			$j(this).addClass('icon'); $j(this).removeClass('iconspacer');},
+			$(this).addClass('icon'); $(this).removeClass('iconspacer');},
 		function() {
-			$j(this).removeClass('icon'); $j(this).addClass('iconspacer');}
+			$(this).removeClass('icon'); $(this).addClass('iconspacer');}
 		);
 
-	$j('.sidebar-group-element').hover(
+	$('.sidebar-group-element').hover(
 		function() {
-			id = $j(this).attr('id');
+			id = $(this).attr('id');
-			$j('#edit-' + id).addClass('icon'); $j('#edit-' + id).removeClass('iconspacer');},
+			$('#edit-' + id).addClass('icon'); $('#edit-' + id).removeClass('iconspacer');},
 
 		function() {
-			id = $j(this).attr('id');
+			id = $(this).attr('id');
-			$j('#edit-' + id).removeClass('icon');$j('#edit-' + id).addClass('iconspacer');}
+			$('#edit-' + id).removeClass('icon');$('#edit-' + id).addClass('iconspacer');}
 		);
 
 
-	$j('.savedsearchdrop').hover(
+	$('.savedsearchdrop').hover(
 		function() {
-			$j(this).addClass('drop'); $j(this).addClass('icon'); $j(this).removeClass('iconspacer');},
+			$(this).addClass('drop'); $(this).addClass('icon'); $(this).removeClass('iconspacer');},
 		function() {
-			$j(this).removeClass('drop'); $j(this).removeClass('icon'); $j(this).addClass('iconspacer');}
+			$(this).removeClass('drop'); $(this).removeClass('icon'); $(this).addClass('iconspacer');}
 	);
 
-	$j('.savedsearchterm').hover(
+	$('.savedsearchterm').hover(
 		function() {
-			id = $j(this).attr('id');
+			id = $(this).attr('id');
-			$j('#drop-' + id).addClass('icon'); 	$j('#drop-' + id).addClass('drophide'); $j('#drop-' + id).removeClass('iconspacer');},
+			$('#drop-' + id).addClass('icon'); 	$('#drop-' + id).addClass('drophide'); $('#drop-' + id).removeClass('iconspacer');},
 
 		function() {
-			id = $j(this).attr('id');
+			id = $(this).attr('id');
-			$j('#drop-' + id).removeClass('icon');$j('#drop-' + id).removeClass('drophide'); $j('#drop-' + id).addClass('iconspacer');}
+			$('#drop-' + id).removeClass('icon');$('#drop-' + id).removeClass('drophide'); $('#drop-' + id).addClass('iconspacer');}
 	);
 
-/*	$j('.nav-load-page-link').click(function() {
+/*	$('.nav-load-page-link').click(function() {
-		getPageContent( $j(this).attr('href') );
+		getPageContent( $(this).attr('href') );
-		hideNavMenu( '#' + $j(this).closest('ul').attr('id') );
+		hideNavMenu( '#' + $(this).closest('ul').attr('id') );
 		return false;
 	});*/
 
-	$j('#event-share-checkbox').change(function() {
+	$('#event-share-checkbox').change(function() {
 
-		if ($j('#event-share-checkbox').is(':checked')) { 
+		if ($('#event-share-checkbox').is(':checked')) { 
-			$j('#acl-wrapper').show();
+			$('#acl-wrapper').show();
 		}
 		else {
-			$j('#acl-wrapper').hide();
+			$('#acl-wrapper').hide();
 		}
 	}).trigger('change');
 
 // For event_end.tpl
-/*		$j('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
+/*		$('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
 			var selstr;
-			$j('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
+			$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
-				selstr = $j(this).text();
+				selstr = $(this).text();
-				$j('#jot-public').hide();
+				$('#jot-public').hide();
 			});
 			if(selstr == null) {
-				$j('#jot-public').show();
+				$('#jot-public').show();
 			}
 
 		}).trigger('change');*/
@@ -99,23 +99,23 @@ $j(document).ready(function() {
 			window.imageUploadButton,
 			{ action: 'wall_upload/'+window.nickname,
 				name: 'userfile',
-				onSubmit: function(file,ext) { $j('#profile-rotator').show(); },
+				onSubmit: function(file,ext) { $('#profile-rotator').show(); },
 				onComplete: function(file,response) {
 					addeditortext(window.jotId, response);
-					$j('#profile-rotator').hide();
+					$('#profile-rotator').hide();
 				}				 
 			}
 		);
 
-		if($j('#wall-file-upload').length) {
+		if($('#wall-file-upload').length) {
 			var file_uploader = new window.AjaxUpload(
 				'wall-file-upload',
 				{ action: 'wall_attach/'+window.nickname,
 					name: 'userfile',
-					onSubmit: function(file,ext) { $j('#profile-rotator').show(); },
+					onSubmit: function(file,ext) { $('#profile-rotator').show(); },
 					onComplete: function(file,response) {
 						addeditortext(window.jotId, response);
-						$j('#profile-rotator').hide();
+						$('#profile-rotator').hide();
 					}				 
 				}
 			);
@@ -132,23 +132,23 @@ $j(document).ready(function() {
 
 
 	if(window.aclType == "settings-head" || window.aclType == "photos_head" || window.aclType == "event_head") {
-		$j('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
+		$('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
 			var selstr;
-			$j('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
+			$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
-				selstr = $j(this).text();
+				selstr = $(this).text();
-				$j('#jot-perms-icon').removeClass('unlock').addClass('lock');
+				$('#jot-perms-icon').removeClass('unlock').addClass('lock');
-				$j('#jot-public').hide();
+				$('#jot-public').hide();
 			});
 			if(selstr == null) { 
-				$j('#jot-perms-icon').removeClass('lock').addClass('unlock');
+				$('#jot-perms-icon').removeClass('lock').addClass('unlock');
-				$j('#jot-public').show();
+				$('#jot-public').show();
 			}
 
 		}).trigger('change');
 	}
 
 	if(window.aclType == "event_head") {
-		$j('#events-calendar').fullCalendar({
+		$('#events-calendar').fullCalendar({
 			events: baseurl + '/events/json/',
 			header: {
 				left: 'prev,next today',
@@ -198,7 +198,7 @@ $j(document).ready(function() {
 		// center on date
 		var args=location.href.replace(baseurl,"").split("/");
 		if (args.length>=4) {
-			$j("#events-calendar").fullCalendar('gotoDate',args[2] , args[3]-1);
+			$("#events-calendar").fullCalendar('gotoDate',args[2] , args[3]-1);
 		} 
 		
 		// show event popup
@@ -209,17 +209,17 @@ $j(document).ready(function() {
 
 	switch(window.autocompleteType) {
 		case 'msg-header':
-			var a = $j("#recip").autocomplete({ 
+			var a = $("#recip").autocomplete({ 
 				serviceUrl: baseurl + '/acl',
 				minChars: 2,
 				width: 350,
 				onSelect: function(value,data) {
-					$j("#recip-complete").val(data);
+					$("#recip-complete").val(data);
 				}			
 			});
 			break;
 		case 'contacts-head':
-			var a = $j("#contacts-search").autocomplete({ 
+			var a = $("#contacts-search").autocomplete({ 
 				serviceUrl: baseurl + '/acl',
 				minChars: 2,
 				width: 350,
@@ -227,23 +227,23 @@ $j(document).ready(function() {
 			a.setOptions({ params: { type: 'a' }});
 			break;
 		case 'display-head':
-			$j(".comment-wwedit-wrapper textarea").contact_autocomplete(baseurl+"/acl");
+			$(".comment-wwedit-wrapper textarea").contact_autocomplete(baseurl+"/acl");
 			break;
 		default:
 			break;
 	}
 
 /*	if(window.autoCompleteType == "display-head") {
-		//$j(".comment-edit-wrapper textarea").contact_autocomplete(baseurl+"/acl");
+		//$(".comment-edit-wrapper textarea").contact_autocomplete(baseurl+"/acl");
 		// make auto-complete work in more places
-		//$j(".wall-item-comment-wrapper textarea").contact_autocomplete(baseurl+"/acl");
+		//$(".wall-item-comment-wrapper textarea").contact_autocomplete(baseurl+"/acl");
-		$j(".comment-wwedit-wrapper textarea").contact_autocomplete(baseurl+"/acl");
+		$(".comment-wwedit-wrapper textarea").contact_autocomplete(baseurl+"/acl");
 	}*/
 
 	// Add Colorbox for viewing Network page images
 	//var cBoxClasses = new Array();
-	$j(".wall-item-body a img").each(function(){
+	$(".wall-item-body a img").each(function(){
-		var aElem = $j(this).parent();
+		var aElem = $(this).parent();
 		var imgHref = aElem.attr("href");
 
 		// We need to make sure we only put a Colorbox on links to Friendica images
@@ -253,22 +253,22 @@ $j(document).ready(function() {
 		if(imgHref.match(/\/photo\/[a-fA-F0-9]+(-[0-9]\.[\w]+?)?$/)) {
 
 			// Add a unique class to all the images of a certain post, to allow scrolling through
-			var cBoxClass = $j(this).closest(".wall-item-body").attr("id") + "-lightbox";
+			var cBoxClass = $(this).closest(".wall-item-body").attr("id") + "-lightbox";
-			$j(this).addClass(cBoxClass);
+			$(this).addClass(cBoxClass);
 
-//			if( $j.inArray(cBoxClass, cBoxClasses) < 0 ) {
+//			if( $.inArray(cBoxClass, cBoxClasses) < 0 ) {
 //				cBoxClasses.push(cBoxClass);
 //			}
 
 			aElem.colorbox({
 				maxHeight: '90%',
 				photo: true, // Colorbox doesn't recognize a URL that don't end in .jpg, etc. as a photo
-				rel: cBoxClass //$j(this).attr("class").match(/wall-item-body-[\d]+-lightbox/)[0]
+				rel: cBoxClass //$(this).attr("class").match(/wall-item-body-[\d]+-lightbox/)[0]
 			});
 		}
 	});
-	/*$j.each(cBoxClasses, function(){
+	/*$.each(cBoxClasses, function(){
-		$j('.'+this).colorbox({
+		$('.'+this).colorbox({
 			maxHeight: '90%',
 			photo: true,
 			rel: this
@@ -279,41 +279,41 @@ $j(document).ready(function() {
 
 
 // update pending count //
-$j(function(){
+$(function(){
 
-	$j("nav").bind('nav-update',  function(e,data){
+	$("nav").bind('nav-update',  function(e,data){
-		var elm = $j('#pending-update');
+		var elm = $('#pending-update');
-		var register = $j(data).find('register').text();
+		var register = $(data).find('register').text();
 		if (register=="0") { register=""; elm.hide();} else { elm.show(); }
 		elm.html(register);
 	});
 });
 
 
-$j(function(){
+$(function(){
 	
-	$j("#cnftheme").click(function(){
+	$("#cnftheme").click(function(){
 		$.colorbox({
 			width: 800,
 			height: '90%',
 			href: baseurl + "/admin/themes/" + $("#id_theme :selected").val(),
 			onComplete: function(){
-				$j("div#fancybox-content form").submit(function(e){
+				$("div#fancybox-content form").submit(function(e){
-					var url = $j(this).attr('action');
+					var url = $(this).attr('action');
 					// can't get .serialize() to work...
 					var data={};
-					$j(this).find("input").each(function(){
+					$(this).find("input").each(function(){
-						data[$j(this).attr('name')] = $j(this).val();
+						data[$(this).attr('name')] = $(this).val();
 					});
-					$j(this).find("select").each(function(){
+					$(this).find("select").each(function(){
-						data[$j(this).attr('name')] = $j(this).children(":selected").val();
+						data[$(this).attr('name')] = $(this).children(":selected").val();
 					});
 					console.log(":)", url, data);
 				
-					$j.post(url, data, function(data) {
+					$.post(url, data, function(data) {
 						if(timer) clearTimeout(timer);
 						NavUpdate();
-						$j.colorbox.close();
+						$.colorbox.close();
 					})
 				
 					return false;
@@ -327,7 +327,7 @@ $j(function(){
 
 
 function homeRedirect() {
-	$j('html').fadeOut('slow', function(){
+	$('html').fadeOut('slow', function(){
 		window.location = baseurl + "/login";
 	});
 }
@@ -335,7 +335,7 @@ function homeRedirect() {
 
 if(typeof window.photoEdit != 'undefined') {
 
-	$j(document).keydown(function(event) {
+	$(document).keydown(function(event) {
 
 			if(window.prevLink != '') { if(event.ctrlKey && event.keyCode == 37) { event.preventDefault(); window.location.href = window.prevLink; }}
 			if(window.nextLink != '') { if(event.ctrlKey && event.keyCode == 39) { event.preventDefault(); window.location.href = window.nextLink; }}
@@ -344,23 +344,23 @@ if(typeof window.photoEdit != 'undefined') {
 }
 
 function showEvent(eventid) {
-	$j.get(
+	$.get(
 		baseurl + '/events/?id='+eventid,
 		function(data){
-			$j.colorbox({html:data});
+			$.colorbox({html:data});
-			$j.colorbox.resize();
+			$.colorbox.resize();
 		}
 	);			
 }
 
 function initCrop() {
 	function onEndCrop( coords, dimensions ) {
-		$( 'x1' ).value = coords.x1;
+		$PR( 'x1' ).value = coords.x1;
-		$( 'y1' ).value = coords.y1;
+		$PR( 'y1' ).value = coords.y1;
-		$( 'x2' ).value = coords.x2;
+		$PR( 'x2' ).value = coords.x2;
-		$( 'y2' ).value = coords.y2;
+		$PR( 'y2' ).value = coords.y2;
-		$( 'width' ).value = dimensions.width;
+		$PR( 'width' ).value = dimensions.width;
-		$( 'height' ).value = dimensions.height;
+		$PR( 'height' ).value = dimensions.height;
 	}
 
 	Event.observe( window, 'load', function() {
@@ -381,14 +381,14 @@ function initCrop() {
 
 
 /*
-$j(document).mouseup(function (clickPos) {
+$(document).mouseup(function (clickPos) {
 
-	var sysMenu = $j("#system-menu-list");
+	var sysMenu = $("#system-menu-list");
-	var sysMenuLink = $j(".system-menu-link");
+	var sysMenuLink = $(".system-menu-link");
-	var contactsMenu = $j("#contacts-menu-list");
+	var contactsMenu = $("#contacts-menu-list");
-	var contactsMenuLink = $j(".contacts-menu-link");
+	var contactsMenuLink = $(".contacts-menu-link");
-	var networkMenu = $j("#network-menu-list");
+	var networkMenu = $("#network-menu-list");
-	var networkMenuLink = $j(".network-menu-link");
+	var networkMenuLink = $(".network-menu-link");
 
 	if( !sysMenu.is(clickPos.target) && !sysMenuLink.is(clickPos.target) && sysMenu.has(clickPos.target).length === 0) {
 		hideNavMenu("#system-menu-list");
@@ -404,20 +404,20 @@ $j(document).mouseup(function (clickPos) {
 
 function getPageContent(url) {
 
-	var pos = $j('.main-container').position();
+	var pos = $('.main-container').position();
 
-	$j('.main-container').css('margin-left', pos.left);	
+	$('.main-container').css('margin-left', pos.left);	
-	$j('.main-content-container').hide(0, function () {
+	$('.main-content-container').hide(0, function () {
-		$j('.main-content-loading').show(0);
+		$('.main-content-loading').show(0);
 	});
 
-	$j.get(url, function(html) {
+	$.get(url, function(html) {
-		console.log($j('.main-content-container').html());
+		console.log($('.main-content-container').html());
-		$j('.main-content-container').html( $j('.main-content-container', html).html() );
+		$('.main-content-container').html( $('.main-content-container', html).html() );
-		console.log($j('.main-content-container').html());
+		console.log($('.main-content-container').html());
-		$j('.main-content-loading').hide(function() {
+		$('.main-content-loading').hide(function() {
-			$j('.main-content-container').fadeIn(800,function() {
+			$('.main-content-container').fadeIn(800,function() {
-				$j('.main-container').css('margin-left', 'auto'); // This sucks -- if the CSS specification changes, this will be wrong
+				$('.main-container').css('margin-left', 'auto'); // This sucks -- if the CSS specification changes, this will be wrong
 			});
 		});
 	});
@@ -434,7 +434,7 @@ function showNavMenu(menuID) {
 		window.navMenuTimeout[menuID + '-opening'] = true;
 		
 		window.navMenuTimeout[menuID + '-timeout'] = setTimeout( function () {
-			$j(menuID).slideDown('fast').show();
+			$(menuID).slideDown('fast').show();
 			window.navMenuTimeout[menuID + '-opening'] = false;
 		}, 200);
 	}
@@ -450,7 +450,7 @@ function hideNavMenu(menuID) {
 		window.navMenuTimeout[menuID + '-closing'] = true;
 		
 		window.navMenuTimeout[menuID + '-timeout'] = setTimeout( function () {
-			$j(menuID).slideUp('fast');
+			$(menuID).slideUp('fast');
 			window.navMenuTimeout[menuID + '-closing'] = false;
 		}, 500);
 	}
@@ -491,7 +491,7 @@ function InitMCEEditor(editorData) {
 	};
 
 	if(window.editSelect != 'none') {
-		$j.extend(tinyMCEInitConfig, editorData);
+		$.extend(tinyMCEInitConfig, editorData);
 		tinyMCE.init(tinyMCEInitConfig);
 	}
 	else if(typeof editorData.plaintextFn == 'function') {
@@ -505,7 +505,7 @@ var textlen = 0;
 function initEditor(cb){
 	if(editor==false) {
 		editor = true;
-		$j("#profile-jot-text-loading").show();
+		$("#profile-jot-text-loading").show();
 
 		var editorData = {
 			mode : "specific_textareas",
@@ -536,53 +536,53 @@ function initEditor(cb){
 					}
 
 					textlen = txt.length;
-					if(textlen != 0 && $j('#jot-perms-icon').is('.unlock')) {
+					if(textlen != 0 && $('#jot-perms-icon').is('.unlock')) {
-						$j('#profile-jot-desc').html(window.isPublic);
+						$('#profile-jot-desc').html(window.isPublic);
 					}
 					else {
-						$j('#profile-jot-desc').html('&nbsp;');
+						$('#profile-jot-desc').html('&nbsp;');
 					}	 
 
 				 //Character count
 
 					if(textlen <= 140) {
-						$j('#character-counter').removeClass('red');
+						$('#character-counter').removeClass('red');
-						$j('#character-counter').removeClass('orange');
+						$('#character-counter').removeClass('orange');
-						$j('#character-counter').addClass('grey');
+						$('#character-counter').addClass('grey');
 					}
 					if((textlen > 140) && (textlen <= 420)) {
-						$j('#character-counter').removeClass('grey');
+						$('#character-counter').removeClass('grey');
-						$j('#character-counter').removeClass('red');
+						$('#character-counter').removeClass('red');
-						$j('#character-counter').addClass('orange');
+						$('#character-counter').addClass('orange');
 					}
 					if(textlen > 420) {
-						$j('#character-counter').removeClass('grey');
+						$('#character-counter').removeClass('grey');
-						$j('#character-counter').removeClass('orange');
+						$('#character-counter').removeClass('orange');
-						$j('#character-counter').addClass('red');
+						$('#character-counter').addClass('red');
 					}
-					$j('#character-counter').text(textlen);
+					$('#character-counter').text(textlen);
 				});
 
 				ed.onInit.add(function(ed) {
 					ed.pasteAsPlainText = true;
-					$j("#profile-jot-text-loading").hide();
+					$("#profile-jot-text-loading").hide();
-					$j(".jothidden").show();
+					$(".jothidden").show();
 					if (typeof cb!="undefined") cb();
 				});
 
 			},
 			plaintextFn : function() {
-				$j("#profile-jot-text-loading").hide();
+				$("#profile-jot-text-loading").hide();
-				$j("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
+				$("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
-				$j("#profile-jot-text").contact_autocomplete(baseurl+"/acl");
+				$("#profile-jot-text").contact_autocomplete(baseurl+"/acl");
-				$j(".jothidden").show();
+				$(".jothidden").show();
 				if (typeof cb!="undefined") cb();
 			}
 		};
 		InitMCEEditor(editorData);
 
 		// setup acl popup
-		$j("a#jot-perms-icon").colorbox({
+		$("a#jot-perms-icon").colorbox({
 			'inline' : true,
 			'transition' : 'elastic'
 		}); 
@@ -593,7 +593,7 @@ function initEditor(cb){
 
 function enableOnUser(){
 	if (editor) return;
-	$j(this).val("");
+	$(this).val("");
 	initEditor();
 }
 
@@ -628,26 +628,26 @@ function msgInitEditor() {
 				}
 
 				textlen = txt.length;
-				if(textlen != 0 && $j('#jot-perms-icon').is('.unlock')) {
+				if(textlen != 0 && $('#jot-perms-icon').is('.unlock')) {
-					$j('#profile-jot-desc').html(window.isPublic);
+					$('#profile-jot-desc').html(window.isPublic);
 				}
 				else {
-					$j('#profile-jot-desc').html('&nbsp;');
+					$('#profile-jot-desc').html('&nbsp;');
 				}	 
 			});
 
 			ed.onInit.add(function(ed) {
 				ed.pasteAsPlainText = true;
 				var editorId = ed.editorId;
-				var textarea = $j('#'+editorId);
+				var textarea = $('#'+editorId);
 				if (typeof(textarea.attr('tabindex')) != "undefined") {
-					$j('#'+editorId+'_ifr').attr('tabindex', textarea.attr('tabindex'));
+					$('#'+editorId+'_ifr').attr('tabindex', textarea.attr('tabindex'));
 					textarea.attr('tabindex', null);
 				}
 			});
 		},
 		plaintextFn : function() {
-			$j("#prvmail-text").contact_autocomplete(baseurl+"/acl");
+			$("#prvmail-text").contact_autocomplete(baseurl+"/acl");
 		}
 	}
 	InitMCEEditor(editorData);
@@ -702,8 +702,8 @@ function profInitEditor() {
 
 function addeditortext(textElem, data) {
 	if(window.editSelect == 'none') {
-		var currentText = $j(textElem).val();
+		var currentText = $(textElem).val();
-		$j(textElem).val(currentText + data);
+		$(textElem).val(currentText + data);
 	}
 	else
 		tinyMCE.execCommand('mceInsertRawHTML',false,data);
@@ -732,7 +732,7 @@ function jotGetLocation() {
 			var lat = position.coords.latitude;
 			var lng = position.coords.longitude;
 
-			$j.ajax({
+			$.ajax({
 				type: 'GET',
 				url: 'http://nominatim.openstreetmap.org/reverse?format=json&lat='+lat+'&lon='+lng,
 				jsonp: 'json_callback',
@@ -741,45 +741,45 @@ function jotGetLocation() {
 				success: function(json) {
 					console.log(json);
 					var locationDisplay = json.address.building+', '+json.address.city+', '+json.address.state;
-					$j('#jot-location').val(locationDisplay);
+					$('#jot-location').val(locationDisplay);
-					$j('#jot-display-location').html('Location: '+locationDisplay);
+					$('#jot-display-location').html('Location: '+locationDisplay);
-					$j('#jot-display-location').show();
+					$('#jot-display-location').show();
 				}
 			});
 		});
 
 	}
 	else {
-		reply = prompt(window.whereAreU, $j('#jot-location').val());
+		reply = prompt(window.whereAreU, $('#jot-location').val());
 		if(reply && reply.length) {
-			$j('#jot-location').val(reply);
+			$('#jot-location').val(reply);
 		}
 	}*/
 
-	reply = prompt(window.whereAreU, $j('#jot-location').val());
+	reply = prompt(window.whereAreU, $('#jot-location').val());
 	if(reply && reply.length) {
-		$j('#jot-location').val(reply);
+		$('#jot-location').val(reply);
 	}
 }
 
 function jotShare(id) {
-	if ($j('#jot-popup').length != 0) $j('#jot-popup').show();
+	if ($('#jot-popup').length != 0) $('#jot-popup').show();
 
-	$j('#like-rotator-' + id).show();
+	$('#like-rotator-' + id).show();
-	$j.get('share/' + id, function(data) {
+	$.get('share/' + id, function(data) {
-		if (!editor) $j("#profile-jot-text").val("");
+		if (!editor) $("#profile-jot-text").val("");
 		initEditor(function(){
 			addeditortext("#profile-jot-text", data);
-			$j('#like-rotator-' + id).hide();
+			$('#like-rotator-' + id).hide();
-			$j(window).scrollTop(0);
+			$(window).scrollTop(0);
 		});
 
 	});
 }
 
 function jotClearLocation() {
-	$j('#jot-coord').val('');
+	$('#jot-coord').val('');
-	$j('#profile-nolocation-wrapper').hide();
+	$('#profile-nolocation-wrapper').hide();
 }
 
 
@@ -787,10 +787,10 @@ function jotGetLink() {
 	reply = prompt(window.linkURL);
 	if(reply && reply.length) {
 		reply = bin2hex(reply);
-		$j('#profile-rotator').show();
+		$('#profile-rotator').show();
-		$j.get('parse_url?binurl=' + reply, function(data) {
+		$.get('parse_url?binurl=' + reply, function(data) {
 			addeditortext(window.jotId, data);
-			$j('#profile-rotator').hide();
+			$('#profile-rotator').hide();
 		});
 	}
 }
@@ -809,18 +809,18 @@ function linkdrop(event) {
 	event.preventDefault();
 	if(reply && reply.length) {
 		reply = bin2hex(reply);
-		$j('#profile-rotator').show();
+		$('#profile-rotator').show();
-		$j.get('parse_url?binurl=' + reply, function(data) {
+		$.get('parse_url?binurl=' + reply, function(data) {
 /*			if(window.jotId == "#profile-jot-text") {
-				if (!editor) $j("#profile-jot-text").val("");
+				if (!editor) $("#profile-jot-text").val("");
 				initEditor(function(){
 					addeditortext(window.jotId, data);
-					$j('#profile-rotator').hide();
+					$('#profile-rotator').hide();
 				});
 			}
 			else {*/
 			addeditortext(window.jotId, data);
-			$j('#profile-rotator').hide();
+			$('#profile-rotator').hide();
 //			}
 		});
 	}
@@ -840,19 +840,19 @@ function deleteCheckedItems(delID) {
 	if(confirm(window.delItems)) {
 		var checkedstr = '';
 
-		$j(delID).hide();
+		$(delID).hide();
-		$j(delID + '-rotator').show();
+		$(delID + '-rotator').show();
-		$j('.item-select').each( function() {
+		$('.item-select').each( function() {
-			if($j(this).is(':checked')) {
+			if($(this).is(':checked')) {
 				if(checkedstr.length != 0) {
-					checkedstr = checkedstr + ',' + $j(this).val();
+					checkedstr = checkedstr + ',' + $(this).val();
 				}
 				else {
-					checkedstr = $j(this).val();
+					checkedstr = $(this).val();
 				}
 			}	
 		});
-		$j.post('item', { dropitems: checkedstr }, function(data) {
+		$.post('item', { dropitems: checkedstr }, function(data) {
 			window.location.reload();
 		});
 	}
@@ -865,9 +865,9 @@ function itemTag(id) {
 		if(reply.length) {
 
 			commentBusy = true;
-			$j('body').css('cursor', 'wait');
+			$('body').css('cursor', 'wait');
 
-			$j.get('tagger/' + id + '?term=' + reply, NavUpdate);
+			$.get('tagger/' + id + '?term=' + reply, NavUpdate);
 			/*if(timer) clearTimeout(timer);
 			timer = setTimeout(NavUpdate,3000);*/
 			liking = 1;
@@ -877,31 +877,31 @@ function itemTag(id) {
 
 function itemFiler(id) {
 	
-	var bordercolor = $j("input").css("border-color");
+	var bordercolor = $("input").css("border-color");
 	
-	$j.get('filer/', function(data){
+	$.get('filer/', function(data){
-		$j.colorbox({html:data});
+		$.colorbox({html:data});
-		$j.colorbox.resize();
+		$.colorbox.resize();
-		$j("#id_term").keypress(function(){
+		$("#id_term").keypress(function(){
-			$j(this).css("border-color",bordercolor);
+			$(this).css("border-color",bordercolor);
 		})
-		$j("#select_term").change(function(){
+		$("#select_term").change(function(){
-			$j("#id_term").css("border-color",bordercolor);
+			$("#id_term").css("border-color",bordercolor);
 		})
 		
-		$j("#filer_save").click(function(e){
+		$("#filer_save").click(function(e){
 			e.preventDefault();
-			reply = $j("#id_term").val();
+			reply = $("#id_term").val();
 			if(reply && reply.length) {
 				commentBusy = true;
-				$j('body').css('cursor', 'wait');
+				$('body').css('cursor', 'wait');
-				$j.get('filer/' + id + '?term=' + reply, NavUpdate);
+				$.get('filer/' + id + '?term=' + reply, NavUpdate);
 /*					if(timer) clearTimeout(timer);
 				timer = setTimeout(NavUpdate,3000);*/
 				liking = 1;
-				$j.colorbox.close();
+				$.colorbox.close();
 			} else {
-				$j("#id_term").css("border-color","#FF0000");
+				$("#id_term").css("border-color","#FF0000");
 			}
 			return false;
 		});
@@ -916,13 +916,13 @@ function itemFiler(id) {
 
 function insertFormatting(comment,BBcode,id) {
 	
-	var tmpStr = $j("#comment-edit-text-" + id).val();
+	var tmpStr = $("#comment-edit-text-" + id).val();
 	if(tmpStr == comment) {
 		tmpStr = "";
-		$j("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+		$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
-		$j("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
+		$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
 		openMenu("comment-edit-submit-wrapper-" + id);
-		$j("#comment-edit-text-" + id).val(tmpStr);
+		$("#comment-edit-text-" + id).val(tmpStr);
 	}
 
 	textarea = document.getElementById("comment-edit-text-" +id);
@@ -945,71 +945,71 @@ function insertFormatting(comment,BBcode,id) {
 }
 
 function cmtBbOpen(id) {
-	$j("#comment-edit-bb-" + id).show();
+	$("#comment-edit-bb-" + id).show();
 }
 function cmtBbClose(id) {
-	$j("#comment-edit-bb-" + id).hide();
+	$("#comment-edit-bb-" + id).hide();
 }
 
 function commentOpen(obj,id) {
 	if(obj.value == window.commentEmptyText) {
 		obj.value = "";
-		$j("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+		$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
-		$j("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
+		$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
-		$j("#mod-cmnt-wrap-" + id).show();
+		$("#mod-cmnt-wrap-" + id).show();
 		openMenu("comment-edit-submit-wrapper-" + id);
 	}
 }
 function commentClose(obj,id) {
 	if(obj.value == "") {
 		obj.value = window.commentEmptyText;
-		$j("#comment-edit-text-" + id).removeClass("comment-edit-text-full");
+		$("#comment-edit-text-" + id).removeClass("comment-edit-text-full");
-		$j("#comment-edit-text-" + id).addClass("comment-edit-text-empty");
+		$("#comment-edit-text-" + id).addClass("comment-edit-text-empty");
-		$j("#mod-cmnt-wrap-" + id).hide();
+		$("#mod-cmnt-wrap-" + id).hide();
 		closeMenu("comment-edit-submit-wrapper-" + id);
 	}
 }
 
 
 function commentInsert(obj,id) {
-	var tmpStr = $j("#comment-edit-text-" + id).val();
+	var tmpStr = $("#comment-edit-text-" + id).val();
 	if(tmpStr == window.commentEmptyText) {
 		tmpStr = "";
-		$j("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+		$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
-		$j("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
+		$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
 		openMenu("comment-edit-submit-wrapper-" + id);
 	}
-	var ins = $j(obj).html();
+	var ins = $(obj).html();
 	ins = ins.replace("&lt;","<");
 	ins = ins.replace("&gt;",">");
 	ins = ins.replace("&amp;","&");
 	ins = ins.replace("&quot;",'"');
-	$j("#comment-edit-text-" + id).val(tmpStr + ins);
+	$("#comment-edit-text-" + id).val(tmpStr + ins);
 }
 
 function qCommentInsert(obj,id) {
-	var tmpStr = $j("#comment-edit-text-" + id).val();
+	var tmpStr = $("#comment-edit-text-" + id).val();
 	if(tmpStr == window.commentEmptyText) {
 		tmpStr = "";
-		$j("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+		$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
-		$j("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
+		$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
 		openMenu("comment-edit-submit-wrapper-" + id);
 	}
-	var ins = $j(obj).val();
+	var ins = $(obj).val();
 	ins = ins.replace("&lt;","<");
 	ins = ins.replace("&gt;",">");
 	ins = ins.replace("&amp;","&");
 	ins = ins.replace("&quot;",'"');
-	$j("#comment-edit-text-" + id).val(tmpStr + ins);
+	$("#comment-edit-text-" + id).val(tmpStr + ins);
-	$j(obj).val("");
+	$(obj).val("");
 }
 
 /*function showHideCommentBox(id) {
-	if( $j('#comment-edit-form-' + id).is(':visible')) {
+	if( $('#comment-edit-form-' + id).is(':visible')) {
-		$j('#comment-edit-form-' + id).hide();
+		$('#comment-edit-form-' + id).hide();
 	}
 	else {
-		$j('#comment-edit-form-' + id).show();
+		$('#comment-edit-form-' + id).show();
 	}
 }*/
 

view/theme/frost/templates/admin_users.tpl

@@ -1,8 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 <script>
 	function confirm_delete(uname){
 		return confirm( "{{$confirm_delete}}".format(uname));
@@ -11,7 +6,7 @@
 		return confirm("{{$confirm_delete_multi}}");
 	}
 	function selectall(cls){
-		$j("."+cls).attr('checked','checked');
+		$("."+cls).attr('checked','checked');
 		return false;
 	}
 </script>

view/theme/frost/templates/cropbody.tpl

@@ -1,8 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 <h1>{{$title}}</h1>
 <p id="cropimage-desc">
 {{$desc}}

view/theme/frost/templates/cropend.tpl

@@ -1,8 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
       <script type="text/javascript" src="library/cropper/lib/prototype.js" language="javascript"></script>
       <script type="text/javascript" src="library/cropper/lib/scriptaculous.js?load=effects,builder,dragdrop" language="javascript"></script>
       <script type="text/javascript" src="library/cropper/cropper.js" language="javascript"></script>

view/theme/frost/templates/crophead.tpl

@@ -1,6 +1 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
       <link rel="stylesheet" href="library/cropper/cropper.css" type="text/css" />

view/theme/frost/templates/end.tpl

@@ -20,8 +20,6 @@
 {{*<!--<script type="text/javascript" src="{{$baseurl}}/library/tiptip/jquery.tipTip.minified.js"></script>-->*}}
 <script type="text/javascript" src="{{$baseurl}}/library/jgrowl/jquery.jgrowl_minimized.js"></script>
 
-<script type="text/javascript">var $j = jQuery.noConflict();</script>
-
 <script type="text/javascript" src="{{$baseurl}}/view/theme/frost/js/acl.min.js" ></script>
 <script type="text/javascript" src="{{$baseurl}}/js/webtoolkit.base64.min.js" ></script>
 <script type="text/javascript" src="{{$baseurl}}/view/theme/frost/js/fk.autocomplete.min.js" ></script>

view/theme/frost/templates/jot_geotag.tpl

@@ -1,16 +1,11 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 
 	if(navigator.geolocation) {
 		navigator.geolocation.getCurrentPosition(function(position) {
 			var lat = position.coords.latitude.toFixed(4);
 			var lon = position.coords.longitude.toFixed(4);
 
-			$j('#jot-coord').val(lat + ', ' + lon);
+			$('#jot-coord').val(lat + ', ' + lon);
-			$j('#profile-nolocation-wrapper').show();
+			$('#profile-nolocation-wrapper').show();
 		});
 	}
 

view/theme/frost/templates/settings_display_end.tpl

@@ -1,7 +1,2 @@
-{{*
+	<script>$(function(){ previewTheme($("#id_{{$theme.0}}")[0]); });</script>
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-	<script>$j(function(){ previewTheme($j("#id_{{$theme.0}}")[0]); });</script>
 

view/theme/frost/theme.php

@@ -26,7 +26,7 @@ function frost_content_loaded(&$a) {
 		$a->theme['stylesheet'] = $a->get_baseurl() . '/view/theme/frost/login-style.css';
 	}
 	if( $a->module === 'login' )
-		$a->page['end'] .= '<script type="text/javascript"> $j(document).ready(function() { $j("#id_" + window.loginName).focus();} );</script>';
+		$a->page['end'] .= '<script type="text/javascript"> $(document).ready(function() { $("#id_" + window.loginName).focus();} );</script>';
 
 }