From 10aaef031bf5f6845f7d5ea053b9620147745c99 Mon Sep 17 00:00:00 2001 From: Serhii Tsymbaliuk Date: Wed, 15 Apr 2020 16:57:28 +0200 Subject: [PATCH] Web UI: Upgrade Dojo version 1.13.0 -> 1.16.2 - upgrade dojo.js bundle - fix prepare-dojo.sh - update Dojo version in package.json (reference purpose only) Ticket: https://pagure.io/freeipa/issue/8222 Signed-off-by: Serhii Tsymbaliuk Reviewed-By: Armando Neto --- install/ui/build/dojo/dojo.js | 10 +++++----- install/ui/src/freeipa/package.json | 2 +- install/ui/util/prepare-dojo.sh | 6 ++---- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/install/ui/build/dojo/dojo.js b/install/ui/build/dojo/dojo.js index 30e771a0f..c2f695756 100644 --- a/install/ui/build/dojo/dojo.js +++ b/install/ui/build/dojo/dojo.js @@ -1,5 +1,5 @@ -(function(userConfig,defaultConfig){var globalObject=function(){if(typeof global!=="undefined"&&typeof global!=="function"){return global}else if(typeof window!=="undefined"){return window}else if(typeof self!=="undefined"){return self}return this}();var noop=function(){},isEmpty=function(it){for(var p in it){return 0}return 1},toString={}.toString,isFunction=function(it){return toString.call(it)=="[object Function]"},isString=function(it){return toString.call(it)=="[object String]"},isArray=function(it){return toString.call(it)=="[object Array]"},forEach=function(vector,callback){if(vector){for(var i=0;icandidateLength){candidate=isFunction(pair[1])?mid.replace(pair[0],pair[1]):pair[1]}});if(candidate){return getModuleInfo_(candidate,0,packs,modules,baseUrl,mapProgs,pathsMapProg,aliases,alwaysCreate)}result=modules[mid];if(result){return alwaysCreate?makeModuleInfo(result.pid,result.mid,result.pack,result.url):modules[mid]}}mapItem=runMapProg(mid,pathsMapProg);if(mapItem){url=mapItem[1]+mid.substring(mapItem[3])}else if(pid){url=pack.location+"/"+midInPackage}else if(has("config-tlmSiblingOfDojo")){url="../"+mid}else{url=mid}if(!/(^\/)|(\:)/.test(url)){url=baseUrl+url}url+=".js";return makeModuleInfo(pid,mid,pack,compactPath(url))},getModuleInfo=function(mid,referenceModule,fromPendingCache){return getModuleInfo_(mid,referenceModule,packs,modules,req.baseUrl,mapProgs,pathsMapProg,aliases,undefined,fromPendingCache)},resolvePluginResourceId=function(plugin,prid,referenceModule){return plugin.normalize?plugin.normalize(prid,function(mid){return toAbsMid(mid,referenceModule)}):toAbsMid(prid,referenceModule)},dynamicPluginUidGenerator=0,getModule=function(mid,referenceModule,immediate){var match,plugin,prid,result;match=mid.match(/^(.+?)\!(.*)$/);if(match){plugin=getModule(match[1],referenceModule,immediate);if(1&&legacyMode==sync&&!plugin.executed){injectModule(plugin);if(plugin.injected===arrived&&!plugin.executed){guardCheckComplete(function(){execModule(plugin)})}if(plugin.executed){promoteModuleToPlugin(plugin)}else{execQ.unshift(plugin)}}if(plugin.executed===executed&&!plugin.load){promoteModuleToPlugin(plugin)}if(plugin.load){prid=resolvePluginResourceId(plugin,match[2],referenceModule);mid=plugin.mid+"!"+(plugin.dynamic?++dynamicPluginUidGenerator+"!":"")+prid}else{prid=match[2];mid=plugin.mid+"!"+ ++dynamicPluginUidGenerator+"!waitingForPlugin"}result={plugin:plugin,mid:mid,req:createRequire(referenceModule),prid:prid}}else{result=getModuleInfo(mid,referenceModule)}return modules[result.mid]||!immediate&&(modules[result.mid]=result)},toAbsMid=req.toAbsMid=function(mid,referenceModule){return getModuleInfo(mid,referenceModule).mid},toUrl=req.toUrl=function(name,referenceModule){var moduleInfo=getModuleInfo(name+"/x",referenceModule),url=moduleInfo.url;return fixupUrl(moduleInfo.pid===0?name:url.substring(0,url.length-5))},nonModuleProps={injected:arrived,executed:executed,def:nonmodule,result:nonmodule},makeCjs=function(mid){return modules[mid]=mix({mid:mid},nonModuleProps)},cjsRequireModule=makeCjs("require"),cjsExportsModule=makeCjs("exports"),cjsModuleModule=makeCjs("module"),runFactory=function(module,args){req.trace("loader-run-factory",[module.mid]);var factory=module.def,result;1&&syncExecStack.unshift(module);if(has("config-dojo-loader-catches")){try{result=isFunction(factory)?factory.apply(null,args):factory}catch(e){signal(error,module.result=makeError("factoryThrew",[module,e]))}}else{result=isFunction(factory)?factory.apply(null,args):factory}module.result=result===undefined&&module.cjs?module.cjs.exports:result;1&&syncExecStack.shift(module)},abortExec={},defOrder=0,promoteModuleToPlugin=function(pluginModule){var plugin=pluginModule.result;pluginModule.dynamic=plugin.dynamic;pluginModule.normalize=plugin.normalize;pluginModule.load=plugin.load;return pluginModule},resolvePluginLoadQ=function(plugin){var map={};forEach(plugin.loadQ,function(pseudoPluginResource){var prid=resolvePluginResourceId(plugin,pseudoPluginResource.prid,pseudoPluginResource.req.module),mid=plugin.dynamic?pseudoPluginResource.mid.replace(/waitingForPlugin$/,prid):plugin.mid+"!"+prid,pluginResource=mix(mix({},pseudoPluginResource),{mid:mid,prid:prid,injected:0});if(!modules[mid]||!modules[mid].injected){injectPlugin(modules[mid]=pluginResource)}map[pseudoPluginResource.mid]=modules[mid];setArrived(pseudoPluginResource);delete modules[pseudoPluginResource.mid]});plugin.loadQ=0;var substituteModules=function(module){for(var replacement,deps=module.deps||[],i=0;i")]);return!module.def||strict?abortExec:module.cjs&&module.cjs.exports}if(!module.executed){if(!module.def){return abortExec}var mid=module.mid,deps=module.deps||[],arg,argResult,args=[],i=0;if(0){circleTrace.push(mid);req.trace("loader-exec-module",["exec",circleTrace.length,mid])}module.executed=executing;while(arg=deps[i++]){argResult=arg===cjsRequireModule?createRequire(module):arg===cjsExportsModule?module.cjs.exports:arg===cjsModuleModule?module.cjs:execModule(arg,strict);if(argResult===abortExec){module.executed=0;req.trace("loader-exec-module",["abort",mid]);0&&circleTrace.pop();return abortExec}args.push(argResult)}runFactory(module,args);finishExec(module);0&&circleTrace.pop()}return module.result},checkCompleteGuard=0,guardCheckComplete=function(proc){try{checkCompleteGuard++;proc()}catch(e){throw e}finally{checkCompleteGuard--}if(execComplete()){signal("idle",[])}},checkComplete=function(){if(checkCompleteGuard){return}guardCheckComplete(function(){checkDojoRequirePlugin();for(var currentDefOrder,module,i=0;i0||window.navigator.msMaxTouchPoints);has.add("touch-events","ontouchstart"in document);has.add("pointer-events","pointerEnabled"in window.navigator?window.navigator.pointerEnabled:"PointerEvent"in window);has.add("MSPointer",window.navigator.msPointerEnabled);has.add("touch-action",has("touch")&&has("pointer-events"));has.add("device-width",screen.availWidth||innerWidth);var form=document.createElement("form");has.add("dom-attributes-explicit",form.attributes.length==0);has.add("dom-attributes-specified-flag",form.attributes.length>0&&form.attributes.length<40)}has.clearElement=function(element){element.innerHTML="";return element};has.normalize=function(id,toAbsMid){var tokens=id.match(/[\?:]|[^:\?]*/g),i=0,get=function(skip){var term=tokens[i++];if(term==":"){return 0}else{if(tokens[i++]=="?"){if(!skip&&has(term)){return get()}else{get(true);return get(skip)}}return term||0}};id=get();return id&&toAbsMid(id)};has.load=function(id,parentRequire,loaded){if(id){parentRequire([id],loaded)}else{loaded()}};return has})},"dojo/_base/declare":function(){define(["./kernel","../has","./lang"],function(dojo,has,lang){var mix=lang.mixin,op=Object.prototype,opts=op.toString,xtor,counter=0,cname="constructor";if(!has("csp-restrictions")){xtor=new Function}else{xtor=function(){}}function err(msg,cls){throw new Error("declare"+(cls?" "+cls:"")+": "+msg)}function c3mro(bases,className){var result=[],roots=[{cls:0,refs:[]}],nameMap={},clsCount=1,l=bases.length,i=0,j,lin,base,top,proto,rec,name,refs;for(;i=0;--j){proto=lin[j].prototype;if(!proto.hasOwnProperty("declaredClass")){proto.declaredClass="uniqName_"+counter++}name=proto.declaredClass;if(!nameMap.hasOwnProperty(name)){nameMap[name]={count:0,refs:[],cls:lin[j]};++clsCount}rec=nameMap[name];if(top&&top!==rec){rec.refs.push(top);++top.count}top=rec}++top.count;roots[0].refs.push(top)}while(roots.length){top=roots.pop();result.push(top.cls);--clsCount;while(refs=top.refs,refs.length==1){top=refs[0];if(!top||--top.count){top=0;break}result.push(top.cls);--clsCount}if(top){for(i=0,l=refs.length;i=0;--i){f=bases[i];m=f._meta;f=m?m.ctor:f;if(f){f.apply(this,preArgs?preArgs[i]:a)}}f=this.postscript;if(f){f.apply(this,args)}}}function singleConstructor(ctor,ctorSpecial){return function(){var a=arguments,t=a,a0=a[0],f;if(!(this instanceof a.callee)){return applyNew(a)}if(ctorSpecial){if(a0){f=a0.preamble;if(f){t=f.apply(this,t)||t}}f=this.preamble;if(f){f.apply(this,t)}}if(ctor){ctor.apply(this,a)}f=this.postscript;if(f){f.apply(this,a)}}}function simpleConstructor(bases){return function(){var a=arguments,i=0,f,m;if(!(this instanceof a.callee)){return applyNew(a)}for(;f=bases[i];++i){m=f._meta;f=m?m.ctor:f;if(f){f.apply(this,a);break}}f=this.postscript;if(f){f.apply(this,a)}}}function chain(name,bases,reversed){return function(){var b,m,f,i=0,step=1;if(reversed){i=bases.length-1;step=-1}for(;b=bases[i];i+=step){m=b._meta;f=(m?m.hidden:b.prototype)[name];if(f){f.apply(this,arguments)}}}}function forceNew(ctor){xtor.prototype=ctor.prototype;var t=new xtor;xtor.prototype=null;return t}function applyNew(args){var ctor=args.callee,t=forceNew(ctor);ctor.apply(t,args);return t}function declare(className,superclass,props){if(typeof className!="string"){props=superclass;superclass=className;className=""}props=props||{};var proto,i,t,ctor,name,bases,chains,mixins=1,parents=superclass;if(opts.call(superclass)=="[object Array]"){bases=c3mro(superclass,className);t=bases[0];mixins=bases.length-t;superclass=bases[mixins]}else{bases=[0];if(superclass){if(opts.call(superclass)=="[object Function]"){t=superclass._meta;bases=bases.concat(t?t.bases:superclass)}else{err("base class is not a callable constructor.",className)}}else if(superclass!==null){err("unknown base class. Did you use dojo.require to pull it in?",className)}}if(superclass){for(i=mixins-1;;--i){proto=forceNew(superclass);if(!i){break}t=bases[i];(t._meta?mixOwn:mix)(proto,t.prototype);if(has("csp-restrictions")){ctor=function(){}}else{ctor=new Function}ctor.superclass=superclass;ctor.prototype=proto;superclass=proto.constructor=ctor}}else{proto={}}declare.safeMixin(proto,props);t=props.constructor;if(t!==op.constructor){t.nom=cname;proto.constructor=t}for(i=mixins-1;i;--i){t=bases[i]._meta;if(t&&t.chains){chains=mix(chains||{},t.chains)}}if(proto["-chains-"]){chains=mix(chains||{},proto["-chains-"])}if(superclass&&superclass.prototype&&superclass.prototype["-chains-"]){chains=mix(chains||{},superclass.prototype["-chains-"])}t=!chains||!chains.hasOwnProperty(cname);bases[0]=ctor=chains&&chains.constructor==="manual"?simpleConstructor(bases):bases.length==1?singleConstructor(props.constructor,t):chainedConstructor(bases,t);ctor._meta={bases:bases,hidden:props,chains:chains,parents:parents,ctor:props.constructor};ctor.superclass=superclass&&superclass.prototype;ctor.extend=extend;ctor.createSubclass=createSubclass;ctor.prototype=proto;proto.constructor=ctor;proto.getInherited=getInherited;proto.isInstanceOf=isInstanceOf;proto.inherited=inheritedImpl;proto.__inherited=inherited;if(className){proto.declaredClass=className;lang.setObject(className,ctor)}if(chains){for(name in chains){if(proto[name]&&typeof chains[name]=="string"&&name!=cname){t=proto[name]=chain(name,bases,chains[name]==="after");t.nom=name}}}return ctor}dojo.safeMixin=declare.safeMixin=safeMixin;dojo.declare=declare;return declare})},"dojo/_base/kernel":function(){define(["../global","../has","./config","require","module"],function(global,has,config,require,module){var i,p,dijit={},dojox={},dojo={config:config,global:global,dijit:dijit,dojox:dojox};var scopeMap={dojo:["dojo",dojo],dijit:["dijit",dijit],dojox:["dojox",dojox]},packageMap=require.map&&require.map[module.id.match(/[^\/]+/)[0]],item;for(p in packageMap){if(scopeMap[p]){scopeMap[p][0]=packageMap[p]}else{scopeMap[p]=[packageMap[p],{}]}}for(p in scopeMap){item=scopeMap[p];item[1]._scopeName=item[0];if(!config.noGlobals){global[item[0]]=item[1]}}dojo.scopeMap=scopeMap;dojo.baseUrl=dojo.config.baseUrl=require.baseUrl;dojo.isAsync=!1||require.async;dojo.locale=config.locale;var rev="$Rev: aaa6750 $".match(/[0-9a-f]{7,}/);dojo.version={major:1,minor:13,patch:0,flag:"",revision:rev?rev[0]:NaN,toString:function(){var v=dojo.version;return v.major+"."+v.minor+"."+v.patch+v.flag+" ("+v.revision+")"}};1||has.add("extend-dojo",1);if(!has("csp-restrictions")){Function("d","d.eval = function(){return d.global.eval ? d.global.eval(arguments[0]) : eval(arguments[0]);}")(dojo)}if(0){dojo.exit=function(exitcode){quit(exitcode)}}else{dojo.exit=function(){}}if(!has("host-webworker")){1||has.add("dojo-guarantee-console",1)}if(1){has.add("console-as-object",function(){return Function.prototype.bind&&console&&typeof console.log==="object"});typeof console!="undefined"||(console={});var cn=["assert","count","debug","dir","dirxml","error","group","groupEnd","info","profile","profileEnd","time","timeEnd","trace","warn","log"];var tn;i=0;while(tn=cn[i++]){if(!console[tn]){(function(){var tcn=tn+"";console[tcn]="log"in console?function(){var a=Array.prototype.slice.call(arguments);a.unshift(tcn+":");console["log"](a.join(" "))}:function(){};console[tcn]._fake=true})()}else if(has("console-as-object")){console[tn]=Function.prototype.bind.call(console[tn],console)}}}has.add("dojo-debug-messages",!!config.isDebug);dojo.deprecated=dojo.experimental=function(){};if(has("dojo-debug-messages")){dojo.deprecated=function(behaviour,extra,removal){var message="DEPRECATED: "+behaviour;if(extra){message+=" "+extra}if(removal){message+=" -- will be removed in version: "+removal}console.warn(message)};dojo.experimental=function(moduleName,extra){var message="EXPERIMENTAL: "+moduleName+" -- APIs subject to change without notice.";if(extra){message+=" "+extra}console.warn(message)}}1||has.add("dojo-modulePaths",1);if(1){if(config.modulePaths){dojo.deprecated("dojo.modulePaths","use paths configuration");var paths={};for(p in config.modulePaths){paths[p.replace(/\./g,"/")]=config.modulePaths[p]}require({paths:paths})}}1||has.add("dojo-moduleUrl",1);if(1){dojo.moduleUrl=function(module,url){dojo.deprecated("dojo.moduleUrl()","use require.toUrl","2.0");var result=null;if(module){result=require.toUrl(module.replace(/\./g,"/")+(url?"/"+url:"")+"/*.*").replace(/\/\*\.\*/,"")+(url?"":"/")}return result}}dojo._hasResource={};return dojo})},"dojo/_base/config":function(){define(["../global","../has","require"],function(global,has,require){var result={};if(1){var src=require.rawConfig,p;for(p in src){result[p]=src[p]}}else{var adviseHas=function(featureSet,prefix,booting){for(p in featureSet){p!="has"&&has.add(prefix+p,featureSet[p],0,booting)}};result=1?require.rawConfig:global.dojoConfig||global.djConfig||{};adviseHas(result,"config",1);adviseHas(result.has,"",1)}if(!result.locale&&typeof navigator!="undefined"){var language=navigator.languages&&navigator.languages.length?navigator.languages[0]:navigator.language||navigator.userLanguage;if(language){result.locale=language.toLowerCase()}}return result})},"dojo/_base/lang":function(){define(["./kernel","../has","../sniff"],function(dojo,has){has.add("bug-for-in-skips-shadowed",function(){for(var i in{toString:1}){return 0}return 1});var _extraNames=has("bug-for-in-skips-shadowed")?"hasOwnProperty.valueOf.isPrototypeOf.propertyIsEnumerable.toLocaleString.toString.constructor".split("."):[],_extraLen=_extraNames.length,getProp=function(parts,create,context){if(!context){if(parts[0]&&dojo.scopeMap[parts[0]]){context=dojo.scopeMap[parts.shift()][1]}else{context=dojo.global}}try{for(var i=0;i2){return lang._hitchArgs.apply(dojo,arguments)}if(!method){method=scope;scope=null}if(lang.isString(method)){scope=scope||dojo.global;if(!scope[method]){throw['lang.hitch: scope["',method,'"] is null (scope="',scope,'")'].join("")}return function(){return scope[method].apply(scope,arguments||[])}}return!scope?method:function(){return method.apply(scope,arguments||[])}},delegate:function(){function TMP(){}return function(obj,props){TMP.prototype=obj;var tmp=new TMP;TMP.prototype=null;if(props){lang._mixin(tmp,props)}return tmp}}(),_toArray:has("ie")?function(){function slow(obj,offset,startWith){var arr=startWith||[];for(var x=offset||0;x=0);has.add("wp",parseFloat(dua.split("Windows Phone")[1])||undefined);has.add("msapp",parseFloat(dua.split("MSAppHost/")[1])||undefined);has.add("khtml",dav.indexOf("Konqueror")>=0?tv:undefined);has.add("edge",parseFloat(dua.split("Edge/")[1])||undefined);has.add("opr",parseFloat(dua.split("OPR/")[1])||undefined);has.add("webkit",!has("wp")&&!has("edge")&&parseFloat(dua.split("WebKit/")[1])||undefined);has.add("chrome",!has("edge")&&!has("opr")&&parseFloat(dua.split("Chrome/")[1])||undefined);has.add("android",!has("wp")&&parseFloat(dua.split("Android ")[1])||undefined);has.add("safari",dav.indexOf("Safari")>=0&&!has("wp")&&!has("chrome")&&!has("android")&&!has("edge")&&!has("opr")?parseFloat(dav.split("Version/")[1]):undefined);has.add("mac",dav.indexOf("Macintosh")>=0);has.add("quirks",document.compatMode=="BackCompat");if(!has("wp")&&dua.match(/(iPhone|iPod|iPad)/)){var p=RegExp.$1.replace(/P/,"p");var v=dua.match(/OS ([\d_]+)/)?RegExp.$1:"1";var os=parseFloat(v.replace(/_/,".").replace(/_/g,""));has.add(p,os);has.add("ios",os)}has.add("bb",(dua.indexOf("BlackBerry")>=0||dua.indexOf("BB10")>=0)&&parseFloat(dua.split("Version/")[1])||undefined);has.add("trident",parseFloat(dav.split("Trident/")[1])||undefined);has.add("svg",typeof SVGAngle!=="undefined");if(!has("webkit")){if(dua.indexOf("Opera")>=0){has.add("opera",tv>=9.8?parseFloat(dua.split("Version/")[1])||tv:tv)}if(dua.indexOf("Gecko")>=0&&!has("wp")&&!has("khtml")&&!has("trident")&&!has("edge")){has.add("mozilla",tv)}if(has("mozilla")){has.add("ff",parseFloat(dua.split("Firefox/")[1]||dua.split("Minefield/")[1])||undefined)}if(document.all&&!has("opera")){var isIE=parseFloat(dav.split("MSIE ")[1])||undefined;var mode=document.documentMode;if(mode&&mode!=5&&Math.floor(isIE)!=mode){isIE=mode}has.add("ie",isIE)}has.add("wii",typeof opera!="undefined"&&opera.wiiremote)}}return has})},"dojo/_base/array":function(){define(["./kernel","../has","./lang"],function(dojo,has,lang){var cache={},u;function buildFn(fn){return cache[fn]=new Function("item","index","array",fn)}function everyOrSome(some){var every=!some;return function(a,fn,o){var i=0,l=a&&a.length||0,result;if(l&&typeof a=="string")a=a.split("");if(typeof fn=="string")fn=cache[fn]||buildFn(fn);if(o){for(;i0){return array.lastIndexOf(a,x,from)}var l=a&&a.length||0,end=up?l+uOver:lOver,i;if(from===u){i=up?lOver:l+uOver}else{if(from<0){i=l+from;if(i<0){i=lOver}}else{i=from>=l?l+uOver:from}}if(l&&typeof a=="string")a=a.split("");for(;i!=end;i+=delta){if(a[i]==x){return i}}return-1}}var array={every:everyOrSome(false),some:everyOrSome(true),indexOf:index(true),lastIndexOf:index(false),forEach:function(arr,callback,thisObject){var i=0,l=arr&&arr.length||0;if(l&&typeof arr=="string")arr=arr.split("");if(typeof callback=="string")callback=cache[callback]||buildFn(callback);if(thisObject){for(;i'"\/]/g;var ESCAPE_MAP={"&":"&","<":"<",">":">",'"':""","'":"'","/":"/"};var string={};lang.setObject("dojo.string",string);string.escape=function(str){if(!str){return""}return str.replace(ESCAPE_REGEXP,function(c){return ESCAPE_MAP[c]})};string.rep=function(str,num){if(num<=0||!str){return""}var buf=[];for(;;){if(num&1){buf.push(str)}if(!(num>>=1)){break}str+=str}return buf.join("")};string.pad=function(text,size,ch,end){if(!ch){ch="0"}var out=String(text),pad=string.rep(ch,Math.ceil((size-out.length)/ch.length));return end?out+pad:pad+out};string.substitute=function(template,map,transform,thisObject){thisObject=thisObject||kernel.global;transform=transform?lang.hitch(thisObject,transform):function(v){return v};return template.replace(/\$\{([^\s\:\}]*)(?:\:([^\s\:\}]+))?\}/g,function(match,key,format){if(key==""){return"$"}var value=lang.getObject(key,false,map);if(format){value=lang.getObject(format,false,thisObject).call(thisObject,value,key)}var result=transform(value,key);if(typeof result==="undefined"){throw new Error('string.substitute could not find key "'+key+'" in template')}return result.toString()})};string.trim=String.prototype.trim?lang.trim:function(str){str=str.replace(/^\s+/,"");for(var i=str.length-1;i>=0;i--){if(/\S/.test(str.charAt(i))){str=str.substring(0,i+1);break}}return str};return string})},"dojo/dom":function(){define(["./sniff","./_base/window","./_base/kernel"],function(has,win,kernel){if(has("ie")<=7){try{document.execCommand("BackgroundImageCache",false,true)}catch(e){}}var dom={};if(has("ie")){dom.byId=function(id,doc){if(typeof id!="string"){return id}var _d=doc||win.doc,te=id&&_d.getElementById(id);if(te&&(te.attributes.id.value==id||te.id==id)){return te}else{var eles=_d.all[id];if(!eles||eles.nodeName){eles=[eles]}var i=0;while(te=eles[i++]){if(te.attributes&&te.attributes.id&&te.attributes.id.value==id||te.id==id){return te}}}}}else{dom.byId=function(id,doc){return(typeof id=="string"?(doc||win.doc).getElementById(id):id)||null}}var doc=kernel.global["document"]||null;has.add("dom-contains",!!(doc&&doc.contains));dom.isDescendant=has("dom-contains")?function(node,ancestor){return!!((ancestor=dom.byId(ancestor))&&ancestor.contains(dom.byId(node)))}:function(node,ancestor){try{node=dom.byId(node);ancestor=dom.byId(ancestor);while(node){if(node==ancestor){return true}node=node.parentNode}}catch(e){}return false};has.add("css-user-select",function(global,doc,element){if(!element){return false}var style=element.style;var prefixes=["Khtml","O","Moz","Webkit"],i=prefixes.length,name="userSelect",prefix;do{if(typeof style[name]!=="undefined"){return name}}while(i--&&(name=prefixes[i]+"UserSelect"));return false});var cssUserSelect=has("css-user-select");dom.setSelectable=cssUserSelect?function(node,selectable){dom.byId(node).style[cssUserSelect]=selectable?"":"none"}:function(node,selectable){node=dom.byId(node);var nodes=node.getElementsByTagName("*"),i=nodes.length;if(selectable){node.removeAttribute("unselectable");while(i--){nodes[i].removeAttribute("unselectable")}}else{node.setAttribute("unselectable","on");while(i--){nodes[i].setAttribute("unselectable","on")}}};return dom})},"dojo/_base/window":function(){define(["./kernel","./lang","../sniff"],function(dojo,lang,has){var ret={global:dojo.global,doc:dojo.global["document"]||null,body:function(doc){doc=doc||dojo.doc;return doc.body||doc.getElementsByTagName("body")[0]},setContext:function(globalObject,globalDocument){dojo.global=ret.global=globalObject;dojo.doc=ret.doc=globalDocument},withGlobal:function(globalObject,callback,thisObject,cbArguments){var oldGlob=dojo.global;try{dojo.global=ret.global=globalObject;return ret.withDoc.call(null,globalObject.document,callback,thisObject,cbArguments)}finally{dojo.global=ret.global=oldGlob}},withDoc:function(documentObject,callback,thisObject,cbArguments){var oldDoc=ret.doc,oldQ=has("quirks"),oldIE=has("ie"),isIE,mode,pwin;try{dojo.doc=ret.doc=documentObject;dojo.isQuirks=has.add("quirks",dojo.doc.compatMode=="BackCompat",true,true);if(has("ie")){if((pwin=documentObject.parentWindow)&&pwin.navigator){isIE=parseFloat(pwin.navigator.appVersion.split("MSIE ")[1])||undefined;mode=documentObject.documentMode;if(mode&&mode!=5&&Math.floor(isIE)!=mode){isIE=mode}dojo.isIE=has.add("ie",isIE,true,true)}}if(thisObject&&typeof callback=="string"){callback=thisObject[callback]}return callback.apply(thisObject,cbArguments||[])}finally{dojo.doc=ret.doc=oldDoc;dojo.isQuirks=has.add("quirks",oldQ,true,true);dojo.isIE=has.add("ie",oldIE,true,true)}}};1&&lang.mixin(dojo,ret);return ret})},"dojo/dom-construct":function(){define(["exports","./_base/kernel","./sniff","./_base/window","./dom","./dom-attr"],function(exports,dojo,has,win,dom,attr){var tagWrap={option:["select"],tbody:["table"],thead:["table"],tfoot:["table"],tr:["table","tbody"],td:["table","tbody","tr"],th:["table","thead","tr"],legend:["fieldset"],caption:["table"],colgroup:["table"],col:["table","colgroup"],li:["ul"]},reTag=/<\s*([\w\:]+)/,masterNode={},masterNum=0,masterName="__"+dojo._scopeName+"ToDomId";for(var param in tagWrap){if(tagWrap.hasOwnProperty(param)){var tw=tagWrap[param];tw.pre=param=="option"?'':"<"+tw.join("><")+">";tw.post=""}}var html5domfix;if(has("ie")<=8){html5domfix=function(doc){doc.__dojo_html5_tested="yes";var div=create("div",{innerHTML:"",style:{visibility:"hidden"}},doc.body);if(div.childNodes.length!==1){("abbr article aside audio canvas details figcaption figure footer header "+"hgroup mark meter nav output progress section summary time video").replace(/\b\w+\b/g,function(n){doc.createElement(n)})}destroy(div)}}function _insertBefore(node,ref){var parent=ref.parentNode;if(parent){parent.insertBefore(node,ref)}}function _insertAfter(node,ref){var parent=ref.parentNode;if(parent){if(parent.lastChild==ref){parent.appendChild(node)}else{parent.insertBefore(node,ref.nextSibling)}}}exports.toDom=function toDom(frag,doc){doc=doc||win.doc;var masterId=doc[masterName];if(!masterId){doc[masterName]=masterId=++masterNum+"";masterNode[masterId]=doc.createElement("div")}if(has("ie")<=8){if(!doc.__dojo_html5_tested&&doc.body){html5domfix(doc)}}frag+="";var match=frag.match(reTag),tag=match?match[1].toLowerCase():"",master=masterNode[masterId],wrap,i,fc,df;if(match&&tagWrap[tag]){wrap=tagWrap[tag];master.innerHTML=wrap.pre+frag+wrap.post;for(i=wrap.length;i;--i){master=master.firstChild}}else{master.innerHTML=frag}if(master.childNodes.length==1){return master.removeChild(master.firstChild)}df=doc.createDocumentFragment();while(fc=master.firstChild){df.appendChild(fc)}return df};exports.place=function place(node,refNode,position){refNode=dom.byId(refNode);if(typeof node=="string"){node=/^\s*90)&&(k<96||k>111)&&(k<186||k>192)&&(k<219||k>222)&&k!=229;if(unprintable||evt.ctrlKey){var c=unprintable?0:k;if(evt.ctrlKey){if(k==3||k==13){return listener.call(evt.currentTarget,evt)}else if(c>95&&c<106){c-=48}else if(!evt.shiftKey&&(c>=65&&c<=90)){c+=32}else{c=_punctMap[c]||c}}var faux=_synthesizeEvent(evt,{type:"keypress",faux:true,charCode:c});listener.call(evt.currentTarget,faux);if(has("ie")){_trySetKeyCode(evt,faux.keyCode)}}});var keypressSignal=on(object,"keypress",function(evt){var c=evt.charCode;c=c>=32?c:0;evt=_synthesizeEvent(evt,{charCode:c,faux:true});return listener.call(this,evt)});return{remove:function(){keydownSignal.remove();keypressSignal.remove()}}}}else{if(has("opera")){keypress=function(object,listener){return on(object,"keypress",function(evt){var c=evt.which;if(c==3){c=99}c=c<32&&!evt.shiftKey?0:c;if(evt.ctrlKey&&!evt.shiftKey&&c>=65&&c<=90){c+=32}return listener.call(this,_synthesizeEvent(evt,{charCode:c}))})}}else{keypress=function(object,listener){return on(object,"keypress",function(evt){setKeyChar(evt);return listener.call(this,evt)})}}}var connect={_keypress:keypress,connect:function(obj,event,context,method,dontFix){var a=arguments,args=[],i=0;args.push(typeof a[0]=="string"?null:a[i++],a[i++]);var a1=a[i+1];args.push(typeof a1=="string"||typeof a1=="function"?a[i++]:null,a[i++]);for(var l=a.length;i-1){events=type.split(/\s*,\s*/)}if(events){var handles=[];var i=0;var eventName;while(eventName=events[i++]){handles.push(on.parse(target,eventName,listener,addListener,dontFix,matchesTarget))}handles.remove=function(){for(var i=0;i=0){s.width=w+u}if(h>=0){s.height=h+u}}function isButtonTag(node){return node.tagName.toLowerCase()=="button"||node.tagName.toLowerCase()=="input"&&(node.getAttribute("type")||"").toLowerCase()=="button"}function usesBorderBox(node){return geom.boxModel=="border-box"||node.tagName.toLowerCase()=="table"||isButtonTag(node)}function getBoundingClientRect(node){var retEmpty={x:0,y:0,width:0,height:0,top:0,right:0,bottom:0,left:0},ret;try{ret=node.getBoundingClientRect()}catch(e){return retEmpty}if(typeof ret.left==="undefined"){return retEmpty}return ret}geom.setContentSize=function setContentSize(node,box,computedStyle){node=dom.byId(node);var w=box.w,h=box.h;if(usesBorderBox(node)){var pb=geom.getPadBorderExtents(node,computedStyle);if(w>=0){w+=pb.w}if(h>=0){h+=pb.h}}setBox(node,NaN,NaN,w,h)};var nilExtents={l:0,t:0,w:0,h:0};geom.setMarginBox=function setMarginBox(node,box,computedStyle){node=dom.byId(node);var s=computedStyle||style.getComputedStyle(node),w=box.w,h=box.h,pb=usesBorderBox(node)?nilExtents:geom.getPadBorderExtents(node,s),mb=geom.getMarginExtents(node,s);if(has("webkit")){if(isButtonTag(node)){var ns=node.style;if(w>=0&&!ns.width){ns.width="4px"}if(h>=0&&!ns.height){ns.height="4px"}}}if(w>=0){w=Math.max(w-pb.w-mb.w,0)}if(h>=0){h=Math.max(h-pb.h-mb.h,0)}setBox(node,box.l,box.t,w,h)};geom.isBodyLtr=function isBodyLtr(doc){doc=doc||win.doc;return(win.body(doc).dir||doc.documentElement.dir||"ltr").toLowerCase()=="ltr"};geom.docScroll=function docScroll(doc){doc=doc||win.doc;var node=doc.parentWindow||doc.defaultView;return"pageXOffset"in node?{x:node.pageXOffset,y:node.pageYOffset}:(node=has("quirks")?win.body(doc):doc.documentElement)&&{x:geom.fixIeBiDiScrollLeft(node.scrollLeft||0,doc),y:node.scrollTop||0}};geom.getIeDocumentElementOffset=function(doc){return{x:0,y:0}};geom.fixIeBiDiScrollLeft=function fixIeBiDiScrollLeft(scrollLeft,doc){doc=doc||win.doc;var ie=has("ie");if(ie&&!geom.isBodyLtr(doc)){var qk=has("quirks"),de=qk?win.body(doc):doc.documentElement,pwin=win.global;if(ie==6&&!qk&&pwin.frameElement&&de.scrollHeight>de.clientHeight){scrollLeft+=de.clientLeft}return ie<8||qk?scrollLeft+de.clientWidth-de.scrollWidth:-scrollLeft}return scrollLeft};geom.position=function(node,includeScroll){node=dom.byId(node);var db=win.body(node.ownerDocument),ret=getBoundingClientRect(node);ret={x:ret.left,y:ret.top,w:ret.right-ret.left,h:ret.bottom-ret.top};if(has("ie")<9){ret.x-=has("quirks")?db.clientLeft+db.offsetLeft:0;ret.y-=has("quirks")?db.clientTop+db.offsetTop:0}if(includeScroll){var scroll=geom.docScroll(node.ownerDocument);ret.x+=scroll.x;ret.y+=scroll.y}return ret};geom.getMarginSize=function getMarginSize(node,computedStyle){node=dom.byId(node);var me=geom.getMarginExtents(node,computedStyle||style.getComputedStyle(node));var size=getBoundingClientRect(node);return{w:size.right-size.left+me.w,h:size.bottom-size.top+me.h}};geom.normalizeEvent=function(event){if(!("layerX"in event)){event.layerX=event.offsetX;event.layerY=event.offsetY}if(!("pageX"in event)){var se=event.target;var doc=se&&se.ownerDocument||document;var docBody=has("quirks")?doc.body:doc.documentElement;event.pageX=event.clientX+geom.fixIeBiDiScrollLeft(docBody.scrollLeft||0,doc);event.pageY=event.clientY+(docBody.scrollTop||0)}};return geom})},"dojo/mouse":function(){define(["./_base/kernel","./on","./has","./dom","./_base/window"],function(dojo,on,has,dom,win){has.add("dom-quirks",win.doc&&win.doc.compatMode=="BackCompat");has.add("events-mouseenter",win.doc&&"onmouseenter"in win.doc.createElement("div"));has.add("events-mousewheel",win.doc&&"onmousewheel"in win.doc);var mouseButtons;if(has("dom-quirks")&&has("ie")||!has("dom-addeventlistener")){mouseButtons={LEFT:1,MIDDLE:4,RIGHT:2,isButton:function(e,button){return e.button&button},isLeft:function(e){return e.button&1},isMiddle:function(e){return e.button&4},isRight:function(e){return e.button&2}}}else{mouseButtons={LEFT:0,MIDDLE:1,RIGHT:2,isButton:function(e,button){return e.button==button},isLeft:function(e){return e.button==0},isMiddle:function(e){return e.button==1},isRight:function(e){return e.button==2}}}dojo.mouseButtons=mouseButtons;function eventHandler(type,selectHandler){var handler=function(node,listener){return on(node,type,function(evt){if(selectHandler){return selectHandler(evt,listener)}if(!dom.isDescendant(evt.relatedTarget,node)){return listener.call(this,evt)}})};handler.bubble=function(select){return eventHandler(type,function(evt,listener){var target=select(evt.target);var relatedTarget=evt.relatedTarget;if(target&&target!=(relatedTarget&&relatedTarget.nodeType==1&&select(relatedTarget))){return listener.call(target,evt)}})};return handler}var wheel;if(has("events-mousewheel")){wheel="mousewheel"}else{wheel=function(node,listener){return on(node,"DOMMouseScroll",function(evt){evt.wheelDelta=-evt.detail;listener.call(this,evt)})}}return{_eventHandler:eventHandler,enter:eventHandler("mouseover"),leave:eventHandler("mouseout"),wheel:wheel,isLeft:mouseButtons.isLeft,isMiddle:mouseButtons.isMiddle,isRight:mouseButtons.isRight}})},"dojo/_base/sniff":function(){define(["./kernel","./lang","../sniff"],function(dojo,lang,has){if(!1){return has}dojo._name="browser" +;lang.mixin(dojo,{isBrowser:true,isFF:has("ff"),isIE:has("ie"),isKhtml:has("khtml"),isWebKit:has("webkit"),isMozilla:has("mozilla"),isMoz:has("mozilla"),isOpera:has("opera"),isSafari:has("safari"),isChrome:has("chrome"),isMac:has("mac"),isIos:has("ios"),isAndroid:has("android"),isWii:has("wii"),isQuirks:has("quirks"),isAir:has("air")});return has})},"dojo/keys":function(){define(["./_base/kernel","./sniff"],function(dojo,has){return dojo.keys={BACKSPACE:8,TAB:9,CLEAR:12,ENTER:13,SHIFT:16,CTRL:17,ALT:18,META:has("webkit")?91:224,PAUSE:19,CAPS_LOCK:20,ESCAPE:27,SPACE:32,PAGE_UP:33,PAGE_DOWN:34,END:35,HOME:36,LEFT_ARROW:37,UP_ARROW:38,RIGHT_ARROW:39,DOWN_ARROW:40,INSERT:45,DELETE:46,HELP:47,LEFT_WINDOW:91,RIGHT_WINDOW:92,SELECT:93,NUMPAD_0:96,NUMPAD_1:97,NUMPAD_2:98,NUMPAD_3:99,NUMPAD_4:100,NUMPAD_5:101,NUMPAD_6:102,NUMPAD_7:103,NUMPAD_8:104,NUMPAD_9:105,NUMPAD_MULTIPLY:106,NUMPAD_PLUS:107,NUMPAD_ENTER:108,NUMPAD_MINUS:109,NUMPAD_PERIOD:110,NUMPAD_DIVIDE:111,F1:112,F2:113,F3:114,F4:115,F5:116,F6:117,F7:118,F8:119,F9:120,F10:121,F11:122,F12:123,F13:124,F14:125,F15:126,NUM_LOCK:144,SCROLL_LOCK:145,UP_DPAD:175,DOWN_DPAD:176,LEFT_DPAD:177,RIGHT_DPAD:178,copyKey:has("mac")&&!has("air")?has("safari")?91:224:17}})},"dojo/dom-class":function(){define(["./_base/lang","./_base/array","./dom"],function(lang,array,dom){var className="className";var cls,spaces=/\s+/,a1=[""];function str2array(s){if(typeof s=="string"||s instanceof String){if(s&&!spaces.test(s)){a1[0]=s;return a1}var a=s.split(spaces);if(a.length&&!a[0]){a.shift()}if(a.length&&!a[a.length-1]){a.pop()}return a}if(!s){return[]}return array.filter(s,function(x){return x})}var fakeNode={};cls={contains:function containsClass(node,classStr){return(" "+dom.byId(node)[className]+" ").indexOf(" "+classStr+" ")>=0},add:function addClass(node,classStr){node=dom.byId(node);classStr=str2array(classStr);var cls=node[className],oldLen;cls=cls?" "+cls+" ":" ";oldLen=cls.length;for(var i=0,len=classStr.length,c;i-1){propertyCallbacks.splice(index,1)}};return handle}})})},"dojo/when":function(){define(["./Deferred","./promise/Promise"],function(Deferred,Promise){"use strict";return function when(valueOrPromise,callback,errback,progback){var receivedPromise=valueOrPromise&&typeof valueOrPromise.then==="function";var nativePromise=receivedPromise&&valueOrPromise instanceof Promise;if(!receivedPromise){if(arguments.length>1){return callback?callback(valueOrPromise):valueOrPromise}else{return(new Deferred).resolve(valueOrPromise)}}else if(!nativePromise){var deferred=new Deferred(valueOrPromise.cancel);valueOrPromise.then(deferred.resolve,deferred.reject,deferred.progress);valueOrPromise=deferred.promise}if(callback||errback||progback){return valueOrPromise.then(callback,errback,progback)}return valueOrPromise}})},"dojo/Deferred":function(){define(["./has","./_base/lang","./errors/CancelError","./promise/Promise","./promise/instrumentation"],function(has,lang,CancelError,Promise,instrumentation){"use strict";var PROGRESS=0,RESOLVED=1,REJECTED=2;var FULFILLED_ERROR_MESSAGE="This deferred has already been fulfilled.";var freezeObject=Object.freeze||function(){};var signalWaiting=function(waiting,type,result,rejection,deferred){if(1){if(type===REJECTED&&Deferred.instrumentRejected&&waiting.length===0){Deferred.instrumentRejected(result,false,rejection,deferred)}}for(var i=0;i")}}}})},"dojo/promise/tracer":function(){define(["../_base/lang","./Promise","../Evented"],function(lang,Promise,Evented){"use strict";var evented=new Evented;var emit=evented.emit;evented.emit=null;function emitAsync(args){setTimeout(function(){emit.apply(evented,args)},0)}Promise.prototype.trace=function(){var args=lang._toArray(arguments);this.then(function(value){emitAsync(["resolved",value].concat(args))},function(error){emitAsync(["rejected",error].concat(args))},function(update){emitAsync(["progress",update].concat(args))});return this};Promise.prototype.traceRejected=function(){var args=lang._toArray(arguments);this.otherwise(function(error){emitAsync(["rejected",error].concat(args))});return this};return evented})},"dojo/io-query":function(){define(["./_base/lang"],function(lang){var backstop={};return{objectToQuery:function objectToQuery(map){var enc=encodeURIComponent,pairs=[];for(var name in map){var value=map[name];if(value!=backstop[name]){var assign=enc(name)+"=";if(lang.isArray(value)){for(var i=0,l=value.length;i0?parameterNames:null},_indexRoutes:function(){var i,l,route,routeIndex,routes=this._routes;routeIndex=this._routeIndex={};for(i=0,l=routes.length;i=0?str.substring(i+1):""}function _getHash(){return _getSegment(location.href,"#")}function _dispatchEvent(){topic.publish("/dojo/hashchange",_getHash())}function _pollLocation(){if(_getHash()===_recentHash){return}_recentHash=_getHash();_dispatchEvent()}function _replace(hash){if(_ieUriMonitor){if(_ieUriMonitor.isTransitioning()){setTimeout(lang.hitch(null,_replace,hash),_pollFrequency);return}var href=_ieUriMonitor.iframe.location.href;var index=href.indexOf("?");_ieUriMonitor.iframe.location.replace(href.substring(0,index)+"?"+hash);return}var href=location.href.replace(/#.*/,"");location.replace(href+"#"+hash);!_connect&&_pollLocation()}function IEUriMonitor(){var ifr=document.createElement("iframe"),IFRAME_ID="dojo-hash-iframe",ifrSrc=config.dojoBlankHtmlUrl||require.toUrl("./resources/blank.html");if(config.useXDomain&&!config.dojoBlankHtmlUrl){console.warn("dojo/hash: When using cross-domain Dojo builds,"+" please save dojo/resources/blank.html to your domain and set djConfig.dojoBlankHtmlUrl"+" to the path on your domain to blank.html")}ifr.id=IFRAME_ID;ifr.src=ifrSrc+"?"+_getHash();ifr.style.display="none";document.body.appendChild(ifr);this.iframe=dojo.global[IFRAME_ID];var recentIframeQuery,transitioning,expectedIFrameQuery,docTitle,ifrOffline,iframeLoc=this.iframe.location;function resetState(){_recentHash=_getHash();recentIframeQuery=ifrOffline?_recentHash:_getSegment(iframeLoc.href,"?");transitioning=false;expectedIFrameQuery=null}this.isTransitioning=function(){return transitioning};this.pollLocation=function(){if(!ifrOffline){try{var iframeSearch=_getSegment(iframeLoc.href,"?");if(document.title!=docTitle){docTitle=this.iframe.document.title=document.title}}catch(e){ifrOffline=true;console.error("dojo/hash: Error adding history entry. Server unreachable.")}}var hash=_getHash();if(transitioning&&_recentHash===hash){if(ifrOffline||iframeSearch===expectedIFrameQuery){resetState();_dispatchEvent()}else{setTimeout(lang.hitch(this,this.pollLocation),0);return}}else if(_recentHash===hash&&(ifrOffline||recentIframeQuery===iframeSearch)){}else{if(_recentHash!==hash){_recentHash=hash;transitioning=true;expectedIFrameQuery=hash;ifr.src=ifrSrc+"?"+expectedIFrameQuery;ifrOffline=false;setTimeout(lang.hitch(this,this.pollLocation),0);return}else if(!ifrOffline){location.href="#"+iframeLoc.search.substring(1);resetState();_dispatchEvent()}}setTimeout(lang.hitch(this,this.pollLocation),_pollFrequency)};resetState();setTimeout(lang.hitch(this,this.pollLocation),_pollFrequency)}domReady(function(){if("onhashchange"in dojo.global&&(!has("ie")||has("ie")>=8&&document.compatMode!="BackCompat")){_connect=aspect.after(dojo.global,"onhashchange",_dispatchEvent,true)}else{if(document.addEventListener){_recentHash=_getHash();setInterval(_pollLocation,_pollFrequency)}else if(document.attachEvent){_ieUriMonitor=new IEUriMonitor}}});return dojo.hash})},"dojo/store/Observable":function(){define(["../_base/kernel","../_base/lang","../when","../_base/array"],function(kernel,lang,when,array){var Observable=function(store){var undef,queryUpdaters=[],revision=0;store=lang.delegate(store);store.notify=function(object,existingId){revision++;var updaters=queryUpdaters.slice();for(var i=0,l=updaters.length;i-1?removedFrom:resultsArray.length;resultsArray.splice(firstInsertedInto,0,changed);insertedInto=array.indexOf(queryExecutor(resultsArray),changed);resultsArray.splice(firstInsertedInto,1);if(options.start&&insertedInto==0||!atEnd&&insertedInto==resultsArray.length){insertedInto=-1}else{resultsArray.splice(insertedInto,0,changed)}}}else if(changed){if(existingId!==undef){insertedInto=removedFrom}else if(!options.start){insertedInto=store.defaultIndex||0;resultsArray.splice(insertedInto,0,changed)}}if((removedFrom>-1||insertedInto>-1)&&(includeObjectUpdates||!queryExecutor||removedFrom!=insertedInto)){var copyListeners=listeners.slice();for(i=0;listener=copyListeners[i];i++){listener(changed||removedObject,removedFrom,insertedInto)}}})})}var handle={};handle.remove=handle.cancel=function(){var index=array.indexOf(listeners,listener);if(index>-1){listeners.splice(index,1);if(!listeners.length){queryUpdaters.splice(array.indexOf(queryUpdaters,queryUpdater),1)}}};return handle}}return results};var inMethod;function whenFinished(method,action){var original=store[method];if(original){store[method]=function(value){var originalId;if(method==="put"){originalId=store.getIdentity(value)}if(inMethod){return original.apply(this,arguments)}inMethod=true;try{var results=original.apply(this,arguments);when(results,function(results){action(typeof results=="object"&&results||value,originalId)});return results}finally{inMethod=false}}}}whenFinished("put",function(object,originalId){store.notify(object,originalId)});whenFinished("add",function(object){store.notify(object)});whenFinished("remove",function(id){store.notify(undefined,id)});return store};lang.setObject("dojo.store.Observable",Observable);return Observable})},"dojo/store/Memory":function(){define(["../_base/declare","./util/QueryResults","./util/SimpleQueryEngine"],function(declare,QueryResults,SimpleQueryEngine){var base=null;return declare("dojo.store.Memory",base,{constructor:function(options){for(var i in options){this[i]=options[i]}this.setData(this.data||[])},data:null,idProperty:"id",index:null,queryEngine:SimpleQueryEngine,get:function(id){return this.data[this.index[id]]},getIdentity:function(object){return object[this.idProperty]},put:function(object,options){var data=this.data,index=this.index,idProperty=this.idProperty;var id=object[idProperty]=options&&"id"in options?options.id:idProperty in object?object[idProperty]:Math.random();if(id in index){if(options&&options.overwrite===false){throw new Error("Object already exists")}data[index[id]]=object}else{index[id]=data.push(object)-1}return id},add:function(object,options){(options=options||{}).overwrite=false;return this.put(object,options)},remove:function(id){var index=this.index;var data=this.data;if(id in index){data.splice(index[id],1);this.setData(data);return true}},query:function(query,options){return QueryResults(this.queryEngine(query,options)(this.data))},setData:function(data){if(data.items){this.idProperty=data.identifier||this.idProperty;data=this.data=data.items}else{this.data=data}this.index={};for(var i=0,l=data.length;ibValue)?-1:1}}return 0})}if(options&&(options.start||options.count)){var total=results.length;results=results.slice(options.start||0,(options.start||0)+(options.count||Infinity));results.total=total}return results}execute.matches=query;return execute}})},"dojo/query":function(){define(["./_base/kernel","./has","./dom","./on","./_base/array","./_base/lang","./selector/_loader","./selector/_loader!default"],function(dojo,has,dom,on,array,lang,loader,defaultEngine){"use strict";has.add("array-extensible",function(){return lang.delegate([],{length:1}).length==1&&!has("bug-for-in-skips-shadowed")});var ap=Array.prototype,aps=ap.slice,apc=ap.concat,forEach=array.forEach;var tnl=function(a,parent,NodeListCtor){var nodeList=new(NodeListCtor||this._NodeListCtor||nl)(a);return parent?nodeList._stash(parent):nodeList};var loopBody=function(f,a,o){a=[0].concat(aps.call(a,0));o=o||dojo.global;return function(node){a[0]=node;return f.apply(o,a)}};var adaptAsForEach=function(f,o){return function(){this.forEach(loopBody(f,arguments,o));return this}};var adaptAsMap=function(f,o){return function(){return this.map(loopBody(f,arguments,o))}};var adaptAsFilter=function(f,o){return function(){return this.filter(loopBody(f,arguments,o))}};var adaptWithCondition=function(f,g,o){return function(){var a=arguments,body=loopBody(f,a,o);if(g.call(o||dojo.global,a)){return this.map(body)}this.forEach(body);return this}};var NodeList=function(array){var isNew=this instanceof nl&&has("array-extensible");if(typeof array=="number"){array=Array(array)}var nodeArray=array&&"length"in array?array:arguments;if(isNew||!nodeArray.sort){var target=isNew?this:[],l=target.length=nodeArray.length;for(var i=0;i0};query.filter=engine.filter||function(nodes,selector,root){return query(selector,root).filter(function(node){return array.indexOf(nodes,node)>-1})};if(typeof engine!="function"){var search=engine.search;engine=function(selector,root){return search(root||document,selector)}}return query}var query=queryForEngine(defaultEngine,NodeList);dojo.query=queryForEngine(defaultEngine,function(array){return NodeList(array)});query.load=function(id,parentRequire,loaded){loader.load(id,parentRequire,function(engine){loaded(queryForEngine(engine,NodeList))})};dojo._filterQueryResult=query._filterResult=function(nodes,selector,root){return new NodeList(query.filter(nodes,selector,root))};dojo.NodeList=query.NodeList=NodeList;return query})},"dojo/selector/_loader":function(){define(["../has","require"],function(has,require){"use strict";if(typeof document!=="undefined"){var testDiv=document.createElement("div");has.add("dom-qsa2.1",!!testDiv.querySelectorAll);has.add("dom-qsa3",function(){try{testDiv.innerHTML="

";return testDiv.querySelectorAll(".TEST:empty").length==1}catch(e){}})}var fullEngine;var acme="./acme",lite="./lite";return{load:function(id,parentRequire,loaded,config){if(config&&config.isBuild){loaded();return}var req=require;id=id=="default"?has("config-selectorEngine")||"css3":id;id=id=="css2"||id=="lite"?lite:id=="css2.1"?has("dom-qsa2.1")?lite:acme:id=="css3"?has("dom-qsa3")?lite:acme:id=="acme"?acme:(req=parentRequire)&&id;if(id.charAt(id.length-1)=="?"){id=id.substring(0,id.length-1);var optionalLoad=true}if(optionalLoad&&(has("dom-compliant-qsa")||fullEngine)){return loaded(fullEngine)}req([id],function(engine){if(id!="./lite"){fullEngine=engine}loaded(engine)})}}})},"dojo/selector/lite":function(){define(["../has","../_base/kernel"],function(has,dojo){"use strict";var testDiv=document.createElement("div");var matchesSelector=testDiv.matches||testDiv.webkitMatchesSelector||testDiv.mozMatchesSelector||testDiv.msMatchesSelector||testDiv.oMatchesSelector;var querySelectorAll=testDiv.querySelectorAll;var unionSplit=/([^\s,](?:"(?:\\.|[^"])+"|'(?:\\.|[^'])+'|[^,])*)/g;has.add("dom-matches-selector",!!matchesSelector);has.add("dom-qsa",!!querySelectorAll);var liteEngine=function(selector,root){if(combine&&selector.indexOf(",")>-1){return combine(selector,root)}var doc=root?root.ownerDocument||root:dojo.doc||document,match=(querySelectorAll?/^([\w]*)#([\w\-]+$)|^(\.)([\w\-\*]+$)|^(\w+$)/:/^([\w]*)#([\w\-]+)(?:\s+(.*))?$|(?:^|(>|.+\s+))([\w\-\*]+)(\S*$)/).exec(selector);root=root||doc;if(match){var isInsideDomTree=has("ie")===8&&has("quirks")?root.nodeType===doc.nodeType:root.parentNode!==null&&root.nodeType!==9&&root.parentNode===doc;if(match[2]&&isInsideDomTree){var found=dojo.byId?dojo.byId(match[2],doc):doc.getElementById(match[2]);if(!found||match[1]&&match[1]!=found.tagName.toLowerCase()){return[]}if(root!=doc){var parent=found;while(parent!=root){parent=parent.parentNode;if(!parent){return[]}}}return match[3]?liteEngine(match[3],found):[found]}if(match[3]&&root.getElementsByClassName){return root.getElementsByClassName(match[4])}var found;if(match[5]){found=root.getElementsByTagName(match[5]);if(match[4]||match[6]){selector=(match[4]||"")+match[6]}else{return found}}}if(querySelectorAll){if(root.nodeType===1&&root.nodeName.toLowerCase()!=="object"){return useRoot(root,selector,root.querySelectorAll)}else{return root.querySelectorAll(selector)}}else if(!found){found=root.getElementsByTagName("*")}var results=[];for(var i=0,l=found.length;i-1&&(" "+node.className+" ").indexOf(classNameSpaced)>-1}},"#":function(id){return function(node){return node.id==id}}};var attrComparators={"^=":function(attrValue,value){return attrValue.indexOf(value)==0},"*=":function(attrValue,value){return attrValue.indexOf(value)>-1},"$=":function(attrValue,value){return attrValue.substring(attrValue.length-value.length,attrValue.length)==value},"~=":function(attrValue,value){return(" "+attrValue+" ").indexOf(" "+value+" ")>-1},"|=":function(attrValue,value){return(attrValue+"-").indexOf(value+"-")==0},"=":function(attrValue,value){return attrValue==value},"":function(attrValue,value){return true}};function attr(name,value,type){var firstChar=value.charAt(0);if(firstChar=='"'||firstChar=="'"){value=value.slice(1,-1)}value=value.replace(/\\/g,"");var comparator=attrComparators[type||""];return function(node){var attrValue=node.getAttribute(name);return attrValue&&comparator(attrValue,value)}}function ancestor(matcher){return function(node,root){while((node=node.parentNode)!=root){if(matcher(node,root)){return true}}}}function parent(matcher){return function(node,root){node=node.parentNode;return matcher?node!=root&&matcher(node,root):node==root}}var cache={};function and(matcher,next){return matcher?function(node,root){return next(node)&&matcher(node,root)}:next}return function(node,selector,root){var matcher=cache[selector];if(!matcher){if(selector.replace(/(?:\s*([> ])\s*)|(#|\.)?((?:\\.|[\w-])+)|\[\s*([\w-]+)\s*(.?=)?\s*("(?:\\.|[^"])+"|'(?:\\.|[^'])+'|(?:\\.|[^\]])*)\s*\]/g,function(t,combinator,type,value,attrName,attrType,attrValue){if(value){matcher=and(matcher,selectorTypes[type||""](value.replace(/\\/g,"")))}else if(combinator){matcher=(combinator==" "?ancestor:parent)(matcher)}else if(attrName){matcher=and(matcher,attr(attrName,attrValue,attrType))}return""})){throw new Error("Syntax error in query")}if(!matcher){return true}cache[selector]=matcher}return matcher(node,root)}}()}if(!has("dom-qsa")){var combine=function(selector,root){var selectors=selector.match(unionSplit);var indexed=[];for(var i=0;i=0;i--){var node=useClone?this._cloneNode(ary[i]):ary[i];if(ary._runParse&&dojo.parser&&dojo.parser.parse){if(!tempNode){tempNode=rNode.ownerDocument.createElement("div")}tempNode.appendChild(node);dojo.parser.parse(tempNode);node=tempNode.firstChild;while(tempNode.firstChild){tempNode.removeChild(tempNode.firstChild)}}if(i==length-1){domCtr.place(node,rNode,position)}else{rNode.parentNode.insertBefore(node,rNode)}rNode=node}},position:aam(domGeom.position),attr:awc(getSet(domAttr),magicGuard),style:awc(getSet(domStyle),magicGuard),addClass:aafe(domCls.add),removeClass:aafe(domCls.remove),toggleClass:aafe(domCls.toggle),replaceClass:aafe(domCls.replace),empty:aafe(domCtr.empty),removeAttr:aafe(domAttr.remove),marginBox:aam(domGeom.getMarginBox),place:function(queryOrNode,position){var item=query(queryOrNode)[0];return this.forEach(function(node){domCtr.place(node,item,position)})},orphan:function(filter){return(filter?query._filterResult(this,filter):this).forEach(orphan)},adopt:function(queryOrListOrNode,position){return query(queryOrListOrNode).place(this[0],position)._stash(this)},query:function(queryStr){if(!queryStr){return this}var ret=new NodeList;this.map(function(node){query(queryStr,node).forEach(function(subNode){if(subNode!==undefined){ret.push(subNode)}})});return ret._stash(this)},filter:function(filter){var a=arguments,items=this,start=0;if(typeof filter=="string"){items=query._filterResult(this,a[0]);if(a.length==1){return items._stash(this)}start=1}return this._wrap(array.filter(items,a[start],a[start+1]),this)},addContent:function(content,position){content=this._normalize(content,this[0]);for(var i=0,node;node=this[i];i++){if(content.length){this._place(content,node,position,i>0)}else{domCtr.empty(node)}}return this}});return NodeList})},"dojo/promise/all":function(){define(["../_base/array","../_base/lang","../Deferred","../when"],function(array,lang,Deferred,when){"use strict";var some=array.some;return function all(objectOrArray){var object,array;if(lang.isArray(objectOrArray)){array=objectOrArray}else if(objectOrArray&&typeof objectOrArray==="object"){object=objectOrArray}var results;var keyLookup=[];if(object){array=[];for(var key in object){if(Object.hasOwnProperty.call(object,key)){keyLookup.push(key);array.push(object[key])}}results={}}else if(array){results=[]}if(!array||!array.length){return(new Deferred).resolve(results)}var deferred=new Deferred;deferred.promise.always(function(){results=keyLookup=null});var waiting=array.length;some(array,function(valueOrPromise,index){if(!object){keyLookup.push(index)}when(valueOrPromise,function(value){if(!deferred.isFulfilled()){results[keyLookup[index]]=value;if(--waiting===0){deferred.resolve(results)}}},deferred.reject);return deferred.isFulfilled()});return deferred.promise}})}}});(function(){var require=this.require;require({cache:{}});!require.async&&require(["dojo"]);require.boot&&require.apply(null,require.boot)})(); diff --git a/install/ui/src/freeipa/package.json b/install/ui/src/freeipa/package.json index 8ba114ec4..63e08484d 100644 --- a/install/ui/src/freeipa/package.json +++ b/install/ui/src/freeipa/package.json @@ -46,7 +46,7 @@ "grunt-qunit-junit": "^0.3.1" }, "dependencies": { - "dojo": "~1.8.1" + "dojo": "~1.16.2" }, "main": "src", "homepage": "http://freeipa.org/", diff --git a/install/ui/util/prepare-dojo.sh b/install/ui/util/prepare-dojo.sh index e6d7594c2..1adf79f48 100755 --- a/install/ui/util/prepare-dojo.sh +++ b/install/ui/util/prepare-dojo.sh @@ -59,7 +59,7 @@ OPTIONS --all Do --clone --checkout --patches --links --dojo --util - --branch
Specify a Dojo branch/tag/hash to checkout, default: 1.8.3 + --branch
Specify a Dojo branch/tag/hash to checkout, default: 1.16.2 --dir Specify a clone dir, default: freeipa/../dojo/ __EOF__ @@ -76,7 +76,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" DOJO_DIR=$DIR/../../../../dojo # working version of Dojo toolkit -BRANCH='1.13.0' +BRANCH='1.16.2' YES='YES' args=`getopt -q -u -l help,checkout,clone,patches,links,dojo,util,all,branch:,dir: a $*` @@ -166,7 +166,6 @@ if [[ $DOJO = $YES ]] ; then git checkout master git fetch --tags git fetch - git branch -D $BRANCH git checkout $BRANCH fi popd @@ -187,7 +186,6 @@ if [[ $UTIL = $YES ]] ; then git checkout master git fetch --tags git fetch - git branch -D $BRANCH git checkout $BRANCH fi