skylinecms 3.1.0 → 3.2.0

data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/utils/editable_selects.js

@@ -16,7 +16,7 @@ var TinyMCE_EditableSelects = {
 
 		for (i=0; i<nl.length; i++) {
 			if (nl[i].className.indexOf('mceEditableSelect') != -1) {
-				o = new Option('(value)', '__mce_add_custom__');
+				o = new Option(tinyMCEPopup.editor.translate('value'), '__mce_add_custom__');
 
 				o.className = 'mceAddSelectValue';
 

data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/utils/form_utils.js

@@ -11,10 +11,14 @@
 var themeBaseURL = tinyMCEPopup.editor.baseURI.toAbsolute('themes/' + tinyMCEPopup.getParam("theme"));
 
 function getColorPickerHTML(id, target_form_element) {
-	var h = "";
+	var h = "", dom = tinyMCEPopup.dom;
 
-	h += '<a id="' + id + '_link" href="javascript:;" onclick="tinyMCEPopup.pickColor(event,\'' + target_form_element +'\');" onmousedown="return false;" class="pickcolor">';
-	h += '<span id="' + id + '" title="' + tinyMCEPopup.getLang('browse') + '">&nbsp;</span></a>';
+	if (label = dom.select('label[for=' + target_form_element + ']')[0]) {
+		label.id = label.id || dom.uniqueId();
+	}
+
+	h += '<a role="button" aria-labelledby="' + id + '_label" id="' + id + '_link" href="javascript:;" onclick="tinyMCEPopup.pickColor(event,\'' + target_form_element +'\');" onmousedown="return false;" class="pickcolor">';
+	h += '<span id="' + id + '" title="' + tinyMCEPopup.getLang('browse') + '">&nbsp;<span id="' + id + '_label" class="mceVoiceLabel mceIconOnly" style="display:none;">' + tinyMCEPopup.getLang('browse') + '</span></span></a>';
 
 	return h;
 }
@@ -67,6 +71,9 @@ function selectByValue(form_obj, field_name, value, add_custom, ignore_case) {
 	if (!form_obj || !form_obj.elements[field_name])
 		return;
 
+	if (!value)
+		value = "";
+
 	var sel = form_obj.elements[field_name];
 
 	var found = false;
@@ -171,7 +178,7 @@ function convertHexToRGB(col) {
 }
 
 function trimSize(size) {
-	return size.replace(/([0-9\.]+)px|(%|in|cm|mm|em|ex|pt|pc)/, '$1$2');
+	return size.replace(/([0-9\.]+)(px|%|in|cm|mm|em|ex|pt|pc)/i, '$1$2');
 }
 
 function getCSSSize(size) {
@@ -183,6 +190,9 @@ function getCSSSize(size) {
 	// Add px
 	if (/^[0-9]+$/.test(size))
 		size += 'px';
+	// Sanity check, IE doesn't like broken values
+	else if (!(/^[0-9\.]+(px|%|in|cm|mm|em|ex|pt|pc)$/i.test(size)))
+		return "";
 
 	return size;
 }

data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/utils/mctabs.js

@@ -10,6 +10,7 @@
 
 function MCTabs() {
 	this.settings = [];
+	this.onChange = tinyMCEPopup.editor.windowManager.createInstance('tinymce.util.Dispatcher');
 };
 
 MCTabs.prototype.init = function(settings) {
@@ -28,26 +29,62 @@ MCTabs.prototype.getParam = function(name, default_value) {
 	return value;
 };
 
-MCTabs.prototype.displayTab = function(tab_id, panel_id) {
-	var panelElm, panelContainerElm, tabElm, tabContainerElm, selectionClass, nodes, i;
+MCTabs.prototype.showTab =function(tab){
+	tab.className = 'current';
+	tab.setAttribute("aria-selected", true);
+	tab.setAttribute("aria-expanded", true);
+	tab.tabIndex = 0;
+};
+
+MCTabs.prototype.hideTab =function(tab){
+	var t=this;
+
+	tab.className = '';
+	tab.setAttribute("aria-selected", false);
+	tab.setAttribute("aria-expanded", false);
+	tab.tabIndex = -1;
+};
+
+MCTabs.prototype.showPanel = function(panel) {
+	panel.className = 'current'; 
+	panel.setAttribute("aria-hidden", false);
+};
+
+MCTabs.prototype.hidePanel = function(panel) {
+	panel.className = 'panel';
+	panel.setAttribute("aria-hidden", true);
+}; 
+
+MCTabs.prototype.getPanelForTab = function(tabElm) {
+	return tinyMCEPopup.dom.getAttrib(tabElm, "aria-controls");
+};
+
+MCTabs.prototype.displayTab = function(tab_id, panel_id, avoid_focus) {
+	var panelElm, panelContainerElm, tabElm, tabContainerElm, selectionClass, nodes, i, t = this;
+
+	tabElm = document.getElementById(tab_id);
+
+	if (panel_id === undefined) {
+		panel_id = t.getPanelForTab(tabElm);
+	}
 
 	panelElm= document.getElementById(panel_id);
 	panelContainerElm = panelElm ? panelElm.parentNode : null;
-	tabElm = document.getElementById(tab_id);
 	tabContainerElm = tabElm ? tabElm.parentNode : null;
-	selectionClass = this.getParam('selection_class', 'current');
+	selectionClass = t.getParam('selection_class', 'current');
 
 	if (tabElm && tabContainerElm) {
 		nodes = tabContainerElm.childNodes;
 
 		// Hide all other tabs
 		for (i = 0; i < nodes.length; i++) {
-			if (nodes[i].nodeName == "LI")
-				nodes[i].className = '';
+			if (nodes[i].nodeName == "LI") {
+				t.hideTab(nodes[i]);
+			}
 		}
 
 		// Show selected tab
-		tabElm.className = 'current';
+		t.showTab(tabElm);
 	}
 
 	if (panelElm && panelContainerElm) {
@@ -56,11 +93,15 @@ MCTabs.prototype.displayTab = function(tab_id, panel_id) {
 		// Hide all other panels
 		for (i = 0; i < nodes.length; i++) {
 			if (nodes[i].nodeName == "DIV")
-				nodes[i].className = 'panel';
+				t.hidePanel(nodes[i]);
+		}
+
+		if (!avoid_focus) { 
+			tabElm.focus();
 		}
 
 		// Show selected panel
-		panelElm.className = 'current';
+		t.showPanel(panelElm);
 	}
 };
 
@@ -73,5 +114,49 @@ MCTabs.prototype.getAnchor = function() {
 	return "";
 };
 
-// Global instance
+
+//Global instance
 var mcTabs = new MCTabs();
+
+tinyMCEPopup.onInit.add(function() {
+	var tinymce = tinyMCEPopup.getWin().tinymce, dom = tinyMCEPopup.dom, each = tinymce.each;
+
+	each(dom.select('div.tabs'), function(tabContainerElm) {
+		var keyNav;
+
+		dom.setAttrib(tabContainerElm, "role", "tablist"); 
+
+		var items = tinyMCEPopup.dom.select('li', tabContainerElm);
+		var action = function(id) {
+			mcTabs.displayTab(id, mcTabs.getPanelForTab(id));
+			mcTabs.onChange.dispatch(id);
+		};
+
+		each(items, function(item) {
+			dom.setAttrib(item, 'role', 'tab');
+			dom.bind(item, 'click', function(evt) {
+				action(item.id);
+			});
+		});
+
+		dom.bind(dom.getRoot(), 'keydown', function(evt) {
+			if (evt.keyCode === 9 && evt.ctrlKey && !evt.altKey) { // Tab
+				keyNav.moveFocus(evt.shiftKey ? -1 : 1);
+				tinymce.dom.Event.cancel(evt);
+			}
+		});
+
+		each(dom.select('a', tabContainerElm), function(a) {
+			dom.setAttrib(a, 'tabindex', '-1');
+		});
+
+		keyNav = tinyMCEPopup.editor.windowManager.createInstance('tinymce.ui.KeyboardNavigation', {
+			root: tabContainerElm,
+			items: items,
+			onAction: action,
+			actOnFocus: true,
+			enableLeftRight: true,
+			enableUpDown: true
+		}, tinyMCEPopup.dom);
+	});
+});

data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/utils/validate.js

@@ -32,7 +32,7 @@ var Validator = {
 	},
 
 	isSize : function(s) {
-		return this.test(s, '^[0-9]+(%|in|cm|mm|em|ex|pt|pc|px)?$');
+		return this.test(s, '^[0-9.]+(%|in|cm|mm|em|ex|pt|pc|px)?$');
 	},
 
 	isId : function(s) {
@@ -96,8 +96,10 @@ var AutoValidator = {
 		var i, nl, s = this.settings, c = 0;
 
 		nl = this.tags(f, 'label');
-		for (i=0; i<nl.length; i++)
+		for (i=0; i<nl.length; i++) {
 			this.removeClass(nl[i], s.invalid_cls);
+			nl[i].setAttribute('aria-invalid', false);
+		}
 
 		c += this.validateElms(f, 'input');
 		c += this.validateElms(f, 'select');
@@ -109,6 +111,33 @@ var AutoValidator = {
 	invalidate : function(n) {
 		this.mark(n.form, n);
 	},
+	
+	getErrorMessages : function(f) {
+		var nl, i, s = this.settings, field, msg, values, messages = [], ed = tinyMCEPopup.editor;
+		nl = this.tags(f, "label");
+		for (i=0; i<nl.length; i++) {
+			if (this.hasClass(nl[i], s.invalid_cls)) {
+				field = document.getElementById(nl[i].getAttribute("for"));
+				values = { field: nl[i].textContent };
+				if (this.hasClass(field, s.min_cls, true)) {
+					message = ed.getLang('invalid_data_min');
+					values.min = this.getNum(field, s.min_cls);
+				} else if (this.hasClass(field, s.number_cls)) {
+					message = ed.getLang('invalid_data_number');
+				} else if (this.hasClass(field, s.size_cls)) {
+					message = ed.getLang('invalid_data_size');
+				} else {
+					message = ed.getLang('invalid_data');
+				}
+				
+				message = message.replace(/{\#([^}]+)\}/g, function(a, b) {
+					return values[b] || '{#' + b + '}';
+				});
+				messages.push(message);
+			}
+		}
+		return messages;
+	},
 
 	reset : function(e) {
 		var t = ['label', 'input', 'select', 'textarea'];
@@ -119,8 +148,10 @@ var AutoValidator = {
 
 		for (i=0; i<t.length; i++) {
 			nl = this.tags(e.form ? e.form : e, t[i]);
-			for (j=0; j<nl.length; j++)
+			for (j=0; j<nl.length; j++) {
 				this.removeClass(nl[j], s.invalid_cls);
+				nl[j].setAttribute('aria-invalid', false);
+			}
 		}
 	},
 
@@ -201,6 +232,7 @@ var AutoValidator = {
 		var s = this.settings;
 
 		this.addClass(n, s.invalid_cls);
+		n.setAttribute('aria-invalid', 'true');
 		this.markLabels(f, n, s.invalid_cls);
 
 		return false;

data/public/skyline/javascripts/src/skyline/src/drag.js

@@ -36,8 +36,8 @@ Skyline.Drag = new Class({
     el = (this.positions) ? this.positions[i] : el.getCoordinates(this.offsetParent);
 
     var now = this.mouse.now;
-    var x = now.x - this.offsets.x;
-    var y = now.y - this.offsets.y;
+    var x = (isNaN(now.x) ? 0 : now.x) - this.offsets.x;
+    var y = (isNaN(now.y) ? 0 : now.y) - this.offsets.y;
 
     return (x > el.left && x < el.right && y < el.bottom && y > el.top);
   },
@@ -52,14 +52,17 @@ Skyline.Drag = new Class({
   },
   start: function(event){
     this.parent(event);
-    this.offsetParent = $(this.options.offsetParent) || this.element.getOffsetParent();
+    var realOffsetParent = this.element.getOffsetParent();
+    this.offsetParent = $(this.options.offsetParent) || realOffsetParent;
     this.offsets = this.offsetParent.getPosition();
-    this.scroll = this.offsetParent.getScroll();        
-    this.offsets.x += this.scroll.x;
-    this.offsets.y += this.scroll.y;
+    this.scroll = this.offsetParent.getScroll();      
+    
     for (var z in this.options.modifiers){
       if (!this.options.modifiers[z]) continue;
-      this.mouse.pos[z] = event.page[z] - this.value.now[z] + this.scroll[z];
+      this.mouse.pos[z] = event.page[z] - this.value.now[z];
+      if(this.offsetParent != realOffsetParent){
+        this.mouse.pos[z] += this.scroll[z];
+      }
     }
   }
 });

data/public/skyline/javascripts/src/skyline/src/layout.js

@@ -8,6 +8,7 @@
   data-panel-hidden - "true","false"
   data-panel-height -
   data-panel-width  -
+  data-panel-position - 
   
   Events:
   afterSetup - Fires after the layout has been set up.
@@ -40,6 +41,7 @@ Skyline.Layout  = new Class({
     this.addSplitterBeforeNext = false;
     
     var o = arguments[1] || {};
+    o = Object.merge(o, this.getElementDataOptions());
     
     if(o.width){ o.autoWidth = false; } else { o.autoWidth = true; }
     if(o.height){ o.autoHeight = false; }  else { o.autoHeight = true; }
@@ -60,8 +62,8 @@ Skyline.Layout  = new Class({
     this.cacheOffsets();    
   },
   
-  setElementDataOptions : function(){
-    var optionKeys = ["hidden", "width", "height"];
+  getElementDataOptions : function(){
+    var optionKeys = ["hidden", "width", "height", "position"];
     var options = {};
     var el = this.element;
     
@@ -69,8 +71,8 @@ Skyline.Layout  = new Class({
       var prop = el.getProperty("data-panel-" + k);
       if(prop){ options[k] = prop }
     });
-    
-    this.setOptions(options);
+
+    return options;
   },
   
   /*
@@ -264,7 +266,6 @@ Skyline.Layout  = new Class({
   },
   // Setup the attached element.
   initializeElement : function(){
-    this.setElementDataOptions();
     
     if(this.options.hidden){
       this.hide(true);
@@ -338,8 +339,8 @@ Skyline.HorizontalLayout = new Class({
   },  
   setupWidths : function(){
     var width = this.width - this.offsets.width;
-    if(width < 0) { width = 0; }
-        
+    if(width < 0 || isNaN(width)) { width = 0; }
+      
     this.element.setStyle("width",width);
     var rest = width;
     var variablePanel = null;
@@ -351,7 +352,7 @@ Skyline.HorizontalLayout = new Class({
           panel.width = panel.element.offsetWidth;          
         } else {
           panel.width = panel.options.width;
-        }
+        }        
         rest = rest - panel.width;
         this.setPanelSize(panel,panel.width);
         panel.setupWidths();          
@@ -367,7 +368,7 @@ Skyline.HorizontalLayout = new Class({
   
   setupHeights : function(){
     var height = this.height - this.offsets.height;
-    if(height < 0){ height = 0; }
+    if(height < 0 || isNaN(height)){ height = 0; }
         
     this.element.setStyle("height",height);
     this.panels.each(function(panel){
@@ -402,8 +403,8 @@ Skyline.VerticalLayout = new Class({
 
   setupWidths : function(){
     var width = this.width - this.offsets.width;
-    if(width < 0) { width = 0; }
-    
+    if(width < 0 || isNaN(width)) { width = 0; }
+
     this.element.setStyle("width", width);
     this.panels.each(function(panel){
       if(panel.hidden){ return; }      
@@ -414,7 +415,7 @@ Skyline.VerticalLayout = new Class({
   
   setupHeights : function(){
     var height = this.height - this.offsets.height;
-    if(height < 0){ height = 0; }
+    if(height < 0 || isNaN(height)){ height = 0; }
     this.element.setStyle("height",height);
     var rest = height;
     

data/public/skyline/javascripts/src/skyline/src/menubutton.js

@@ -76,9 +76,7 @@ Skyline.MenuButton = new Class({
       if(!(lnk.get("tag") == "a")){
         lnk = lnk.getParent("a");
       }
-      if(lnk){
-        lnk.fireEvent("click",ev);
-      } else {
+      if(!lnk){
         Event.stop(ev);        
       }
       // this.deactivate();

data/public/skyline/javascripts/src/skyline/src/sortable.js

@@ -15,9 +15,9 @@ Skyline.Sortable = new Class({
   initialize : function(listEl){
     this.setOptions(arguments[1]);
     
-    this.element = $(listEl);
+    this.element = document.id(listEl);
     if(this.options.offsetParent){
-      this.oParent = $(this.options.offsetParent);
+      this.oParent = document.id(this.options.offsetParent);
     } else {
       this.oParent = this.element.getOffsetParent();
     }
@@ -35,7 +35,7 @@ Skyline.Sortable = new Class({
     };
   },
   addItem : function(el){
-    var el = $(el);
+    var el = document.id(el);
     var h = el;
     if(this.options.handle){
       h = el.getElement(this.options.handle);
@@ -105,10 +105,12 @@ Skyline.Sortable = new Class({
     
     if(this.marker){
       this.marker.destroy();
+      this.marker = null;
     }
     
+    this.drag.detach();    
     this.clone.destroy();
-    this.drag.detach();
+    
     this.idle = true;
     this.fireEvent('stop', this.draggable);    
   },
@@ -129,7 +131,7 @@ Skyline.Sortable = new Class({
   _getDragMarker : function(){
     if(this.marker){ return this.marker; }
     this.marker = new Element("li",{"styles" : {"z-index" : 99, "display" : "none" }, "class" : "marker"});
-    this.marker.inject($(document.body));
+    this.marker.inject(document.id(document.body));
     return this.marker;
   },
   _getDropPosition : function(el,droppable){