tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2010-10-25 Miguel de Dios <miguel.dedios@artica.es> 

* include/javascript/jquery.pandora.controls.js,
	include/javascript/tiny_mce/plugins/media/js/media.js,
	include/javascript/tiny_mce/plugins/table/editor_plugin.js,
	include/javascript/tiny_mce/plugins/table/js/cell.js,
	include/javascript/tiny_mce/plugins/xhtmlxtras/js/element_common.js,
	include/javascript/tiny_mce/themes/advanced/js/color_picker.js,
	include/javascript/tiny_mce/themes/advanced/js/image.js,
	include/javascript/jquery.pandora.js,
	include/javascript/jquery.tablesorter.js,
	include/javascript/OpenLayers/OpenLayers.js,
	include/javascript/jquery.form.js, include/javascript/jquery.timeentry.js,
	include/javascript/jquery.countdown.js,
	godmode/reporting/visual_console_builder.editor.js: fixed end of lines that
	it haven't semicolon end char.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3461 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2010-10-25 16:06:37 +00:00
parent 3c7fe22f1a
commit da22943171
15 changed files with 43 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pandora_console/ChangeLog
View File

@ -1,3 +1,20 @@
2010-10-25 Miguel de Dios <miguel.dedios@artica.es>
* include/javascript/jquery.pandora.controls.js,
include/javascript/tiny_mce/plugins/media/js/media.js,
include/javascript/tiny_mce/plugins/table/editor_plugin.js,
include/javascript/tiny_mce/plugins/table/js/cell.js,
include/javascript/tiny_mce/plugins/xhtmlxtras/js/element_common.js,
include/javascript/tiny_mce/themes/advanced/js/color_picker.js,
include/javascript/tiny_mce/themes/advanced/js/image.js,
include/javascript/jquery.pandora.js,
include/javascript/jquery.tablesorter.js,
include/javascript/OpenLayers/OpenLayers.js,
include/javascript/jquery.form.js, include/javascript/jquery.timeentry.js,
include/javascript/jquery.countdown.js,
godmode/reporting/visual_console_builder.editor.js: fixed end of lines that
it haven't semicolon end char.
2010-10-25 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_agents.php: clean source style.

2
pandora_console/godmode/reporting/visual_console_builder.editor.js
View File

@ -280,7 +280,7 @@ function actionClick() {
showAdvanceOptions(false);
openPropertiesPanel = false
openPropertiesPanel = false;
return;
}

6
pandora_console/include/javascript/OpenLayers/OpenLayers.js
View File

@ -433,8 +433,8 @@ return changed;},pagePrevious:function(){var changed=false;if(this.features){if(
var start=(this.num-1)*this.length;changed=this.page(start);}
return changed;},page:function(start,event){var changed=false;if(this.features){if(start>=0&&start<this.features.length){var num=Math.floor(start/this.length);if(num!=this.num){this.paging=true;var features=this.features.slice(start,start+this.length);this.layer.removeFeatures(this.layer.features);this.num=num;if(event&&event.features){event.features=features;}else{this.layer.addFeatures(features);}
this.paging=false;changed=true;}}}
return changed;},CLASS_NAME:"OpenLayers.Strategy.Paging"});OpenLayers.Strategy.Save=OpenLayers.Class(OpenLayers.Strategy,{auto:false,timer:null,initialize:function(options){OpenLayers.Strategy.prototype.initialize.apply(this,[options]);},activate:function(){var activated=OpenLayers.Strategy.prototype.activate.call(this);if(activated){if(this.auto){if(typeof this.auto==="number"){this.timer=window.setInterval(OpenLayers.Function.bind(this.save,this),this.auto*1000)}else{this.layer.events.on({"featureadded":this.triggerSave,"afterfeaturemodified":this.triggerSave,scope:this});}}}
return activated;},deactivate:function(){var deactivated=OpenLayers.Strategy.prototype.deactivate.call(this);if(deactivated){if(this.auto){if(typeof this.auto==="number"){window.clearInterval(this.timer);}else{this.layer.events.un({"featureadded":this.triggerSave,"afterfeaturemodified":this.triggerSave,scope:this})}}}
return changed;},CLASS_NAME:"OpenLayers.Strategy.Paging"});OpenLayers.Strategy.Save=OpenLayers.Class(OpenLayers.Strategy,{auto:false,timer:null,initialize:function(options){OpenLayers.Strategy.prototype.initialize.apply(this,[options]);},activate:function(){var activated=OpenLayers.Strategy.prototype.activate.call(this);if(activated){if(this.auto){if(typeof this.auto==="number"){this.timer=window.setInterval(OpenLayers.Function.bind(this.save,this),this.auto*1000);}else{this.layer.events.on({"featureadded":this.triggerSave,"afterfeaturemodified":this.triggerSave,scope:this});}}}
return activated;},deactivate:function(){var deactivated=OpenLayers.Strategy.prototype.deactivate.call(this);if(deactivated){if(this.auto){if(typeof this.auto==="number"){window.clearInterval(this.timer);}else{this.layer.events.un({"featureadded":this.triggerSave,"afterfeaturemodified":this.triggerSave,scope:this});}}}
return deactivated;},triggerSave:function(event){var feature=event.feature;if(feature.state===OpenLayers.State.INSERT||feature.state===OpenLayers.State.UPDATE||feature.state===OpenLayers.State.DELETE){this.save([event.feature]);}},save:function(features){if(!features){features=this.layer.features;}
var remote=this.layer.projection;var local=this.layer.map.getProjectionObject();if(!local.equals(remote)){var len=features.length;var clones=new Array(len);var orig,clone;for(var i=0;i<len;++i){orig=features[i];clone=orig.clone();clone.fid=orig.fid;clone.state=orig.state;clone._original=orig;clone.geometry.transform(local,remote);clones[i]=clone;}
features=clones;}
@ -1511,7 +1511,7 @@ if(this.hover){this.handlers.hover=new OpenLayers.Handler.Hover(this,{'move':thi
return OpenLayers.Control.prototype.activate.apply(this,arguments);},deactivate:function(){if(this.active){for(var i in this.handlers){this.handlers[i].deactivate();}}
return OpenLayers.Control.prototype.deactivate.apply(this,arguments);},unselectAll:function(options){var feature;for(var i=this.features.length-1;i>=0;--i){feature=this.features[i];if(!options||options.except!=feature){this.unselect(feature);}}},selectSingle:function(evt){OpenLayers.Element.addClass(this.map.viewPortDiv,"olCursorWait");var bounds=this.pixelToBounds(evt.xy);this.setModifiers(evt);this.request(bounds,{single:true});},selectBox:function(position){if(position instanceof OpenLayers.Bounds){var minXY=this.map.getLonLatFromPixel(new OpenLayers.Pixel(position.left,position.bottom));var maxXY=this.map.getLonLatFromPixel(new OpenLayers.Pixel(position.right,position.top));var bounds=new OpenLayers.Bounds(minXY.lon,minXY.lat,maxXY.lon,maxXY.lat);this.setModifiers(this.handlers.box.dragHandler.evt);this.request(bounds);}},selectHover:function(evt){var bounds=this.pixelToBounds(evt.xy);this.request(bounds,{single:true,hover:true});},cancelHover:function(){if(this.hoverResponse){this.protocol.abort(this.hoverResponse);this.hoverResponse=null;}},request:function(bounds,options){options=options||{};var filter=new OpenLayers.Filter.Spatial({type:OpenLayers.Filter.Spatial.BBOX,value:bounds});var response=this.protocol.read({maxFeatures:options.single==true?this.maxFeatures:undefined,filter:filter,callback:function(result){if(result.code==1){if(result.features.length){if(options.single==true){this.selectBestFeature(result.features,bounds.getCenterLonLat(),options);}else{this.select(result.features);}}else if(options.hover){this.hoverSelect();}else{this.events.triggerEvent("clickout");if(this.clickout){this.unselectAll();}}}
OpenLayers.Element.removeClass(this.map.viewPortDiv,"olCursorWait");},scope:this});if(options.hover==true){this.hoverResponse=response;}},selectBestFeature:function(features,clickPosition,options){options=options||{};if(features.length){var point=new OpenLayers.Geometry.Point(clickPosition.lon,clickPosition.lat);var feature,resultFeature,dist;var minDist=Number.MAX_VALUE;for(var i=0;i<features.length;++i){feature=features[i];if(feature.geometry){dist=point.distanceTo(feature.geometry,{edge:false});if(dist<minDist){minDist=dist;resultFeature=feature;if(minDist==0){break;}}}}
if(options.hover==true){this.hoverSelect(resultFeature);}else{this.select(resultFeature||features);}};},setModifiers:function(evt){this.modifiers={multiple:this.multiple||(this.multipleKey&&evt[this.multipleKey]),toggle:this.toggle||(this.toggleKey&&evt[this.toggleKey])}},select:function(features){if(!this.modifiers.multiple&&!this.modifiers.toggle){this.unselectAll();}
if(options.hover==true){this.hoverSelect(resultFeature);}else{this.select(resultFeature||features);}};},setModifiers:function(evt){this.modifiers={multiple:this.multiple||(this.multipleKey&&evt[this.multipleKey]),toggle:this.toggle||(this.toggleKey&&evt[this.toggleKey]);}},select:function(features){if(!this.modifiers.multiple&&!this.modifiers.toggle){this.unselectAll();}
if(!(features instanceof Array)){features=[features];}
var feature;for(var i=0,len=features.length;i<len;++i){feature=features[i];if(this.features[feature.fid||feature.id]){if(this.modifiers.toggle){this.unselect(this.features[feature.fid||feature.id]);}}else{cont=this.events.triggerEvent("beforefeatureselected",{feature:feature});if(cont!==false){this.features[feature.fid||feature.id]=feature;this.events.triggerEvent("featureselected",{feature:feature});}}}},hoverSelect:function(feature){var fid=feature?feature.fid||feature.id:null;var hfid=this.hoverFeature?this.hoverFeature.fid||this.hoverFeature.id:null;if(hfid&&hfid!=fid){this.events.triggerEvent("outfeature",{feature:this.hoverFeature});this.hoverFeature=null;}
if(fid&&fid!=hfid){this.events.triggerEvent("hoverfeature",{feature:feature});this.hoverFeature=feature;}},unselect:function(feature){delete this.features[feature.fid||feature.id];this.events.triggerEvent("featureunselected",{feature:feature});},unselectAll:function(){for(var fid in this.features){this.unselect(this.features[fid]);}},setMap:function(map){for(var i in this.handlers){this.handlers[i].setMap(map);}

2
pandora_console/include/javascript/jquery.countdown.js
View File

File diff suppressed because one or more lines are too long

2
pandora_console/include/javascript/jquery.form.js
View File

@ -566,7 +566,7 @@ $.fn.resetForm = function() {
$.fn.enable = function(b) {
if (b == undefined) b = true;
return this.each(function() {
this.disabled = !b
this.disabled = !b;
});
};

2
pandora_console/include/javascript/jquery.pandora.controls.js
View File

@ -290,7 +290,7 @@
"id_group": id_group
},
function (data) {
img = $("<img />").attr ("src", "images/groups_small/"+data["icon"]+".png")
img = $("<img />").attr ("src", "images/groups_small/"+data["icon"]+".png");
$(config.spanPreview)
.append (img)
.fadeIn ('fast');

4
pandora_console/include/javascript/jquery.pandora.js
View File

@ -2,12 +2,12 @@
$.fn.check = function () {
return this.each (function () {
this.checked = true;
})};
});};
$.fn.uncheck = function () {
return this.each (function () {
this.checked = false;
})};
});};
$.fn.enable = function () {
return $(this).removeAttr ("disabled");

4
pandora_console/include/javascript/jquery.tablesorter.js
View File

@ -242,7 +242,7 @@
function appendToTable(table,cache) {
if(table.config.debug) {var appendTime = new Date()}
if(table.config.debug) {var appendTime = new Date();}
var c = cache,
r = c.row,
@ -583,7 +583,7 @@
// cancel selection
}).mousedown(function() {
if(config.cancelSelection) {
this.onselectstart = function() {return false};
this.onselectstart = function() {return false;};
return false;
}
});

2
pandora_console/include/javascript/jquery.timeentry.js
View File

File diff suppressed because one or more lines are too long

2
pandora_console/include/javascript/tiny_mce/plugins/media/js/media.js vendored
View File

@ -12,7 +12,7 @@ function init() {
ed = tinyMCEPopup.editor;
tinyMCEPopup.resizeToInnerSize();
f = document.forms[0]
f = document.forms[0];
fe = ed.selection.getNode();
if (/mceItem(Flash|ShockWave|WindowsMedia|QuickTime|RealMedia)/.test(ed.dom.getAttrib(fe, 'class'))) {

2
pandora_console/include/javascript/tiny_mce/plugins/table/editor_plugin.js vendored
View File

File diff suppressed because one or more lines are too long

2
pandora_console/include/javascript/tiny_mce/plugins/table/js/cell.js vendored
View File

@ -8,7 +8,7 @@ function init() {
document.getElementById('backgroundimagebrowsercontainer').innerHTML = getBrowserHTML('backgroundimagebrowser','backgroundimage','image','table');
document.getElementById('bordercolor_pickcontainer').innerHTML = getColorPickerHTML('bordercolor_pick','bordercolor');
document.getElementById('bgcolor_pickcontainer').innerHTML = getColorPickerHTML('bgcolor_pick','bgcolor')
document.getElementById('bgcolor_pickcontainer').innerHTML = getColorPickerHTML('bgcolor_pick','bgcolor');
var inst = ed;
var tdElm = ed.dom.getParent(ed.selection.getStart(), "td,th");

16
pandora_console/include/javascript/tiny_mce/plugins/xhtmlxtras/js/element_common.js vendored
View File

@ -129,7 +129,7 @@ SXE = {
currentAction : "insert",
inst : tinyMCEPopup.editor,
updateElement : null
}
};
SXE.focusElement = SXE.inst.selection.getNode();
@ -149,7 +149,7 @@ SXE.initElementDialog = function(element_name) {
}
document.forms[0].insert.value = tinyMCEPopup.getLang(SXE.currentAction, 'Insert', true);
}
};
SXE.insertElement = function(element_name) {
var elm = SXE.inst.dom.getParent(SXE.focusElement, element_name.toUpperCase()), h, tagName;
@ -180,7 +180,7 @@ SXE.insertElement = function(element_name) {
}
SXE.inst.nodeChanged();
tinyMCEPopup.execCommand('mceEndUndoLevel');
}
};
SXE.removeElement = function(element_name){
element_name = element_name.toLowerCase();
@ -191,15 +191,15 @@ SXE.removeElement = function(element_name){
SXE.inst.nodeChanged();
tinyMCEPopup.execCommand('mceEndUndoLevel');
}
}
};
SXE.showRemoveButton = function() {
document.getElementById("remove").style.display = '';
}
};
SXE.containsClass = function(elm,cl) {
return (elm.className.indexOf(cl) > -1) ? true : false;
}
};
SXE.removeClass = function(elm,cl) {
if(elm.className == null || elm.className == "" || !SXE.containsClass(elm,cl)) {
@ -213,12 +213,12 @@ SXE.removeClass = function(elm,cl) {
}
}
elm.className = newClassNames.substring(0,newClassNames.length-1); //removes extra space at the end
}
};
SXE.addClass = function(elm,cl) {
if(!SXE.containsClass(elm,cl)) elm.className ? elm.className += " " + cl : elm.className = cl;
return true;
}
};
function insertInlineElement(en) {
var ed = tinyMCEPopup.editor, dom = ed.dom;

2
pandora_console/include/javascript/tiny_mce/themes/advanced/js/color_picker.js vendored
View File

@ -178,7 +178,7 @@ function generateNamedColors() {
for (n in named) {
v = named[n];
h += '<a href="javascript:insertAction();" onmouseover="showColor(\'' + n + '\',\'' + v + '\');" style="background-color: ' + n + '"><!-- IE --></a>'
h += '<a href="javascript:insertAction();" onmouseover="showColor(\'' + n + '\',\'' + v + '\');" style="background-color: ' + n + '"><!-- IE --></a>';
}
el.innerHTML = h;

4
pandora_console/include/javascript/tiny_mce/themes/advanced/js/image.js vendored
View File

@ -171,7 +171,7 @@ var ImageDialog = {
break;
case 'hspace':
v = dom.getStyle(e, 'margin-left')
v = dom.getStyle(e, 'margin-left');
v2 = dom.getStyle(e, 'margin-right');
if (v && v == v2)
return parseInt(v.replace(/[^0-9]/g, ''));
@ -179,7 +179,7 @@ var ImageDialog = {
break;
case 'vspace':
v = dom.getStyle(e, 'margin-top')
v = dom.getStyle(e, 'margin-top');
v2 = dom.getStyle(e, 'margin-bottom');
if (v && v == v2)
return parseInt(v.replace(/[^0-9]/g, ''));