Bugzilla – Attachment 55140 Details for
Bug 17241
Start using Bower for installing and managing Koha's JavaScript Dependencies
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 17241 - Replace existing version of requirejs with bower installed requirejs
Bug-17241---Replace-existing-version-of-requirejs-.patch (text/plain), 101.98 KB, created by
Kyle M Hall (khall)
on 2016-09-02 14:38:16 UTC
(
hide
)
Description:
Bug 17241 - Replace existing version of requirejs with bower installed requirejs
Filename:
MIME Type:
Creator:
Kyle M Hall (khall)
Created:
2016-09-02 14:38:16 UTC
Size:
101.98 KB
patch
obsolete
>From 4fae00e39aec2a0fbc2a6a45956bb316ecef2464 Mon Sep 17 00:00:00 2001 >From: Kyle M Hall <kyle@bywatersolutions.com> >Date: Fri, 2 Sep 2016 13:29:27 +0000 >Subject: [PATCH] Bug 17241 - Replace existing version of requirejs with bower > installed requirejs > >Test Plan: >1) Apply this patch set >2) Enable the advancedMARCeditor system preference >3) Attempt to edit a MARC record using the advanced editor >4) The editor should continue to load and function as previously >--- > koha-tmpl/intranet-tmpl/lib/bower.json | 5 +- > koha-tmpl/intranet-tmpl/lib/require.js | 36 - > koha-tmpl/intranet-tmpl/lib/requirejs/.bower.json | 24 + > koha-tmpl/intranet-tmpl/lib/requirejs/README.md | 4 + > koha-tmpl/intranet-tmpl/lib/requirejs/bower.json | 14 + > koha-tmpl/intranet-tmpl/lib/requirejs/require.js | 2053 ++++++++++++++++++++ > .../prog/en/includes/cateditor-ui.inc | 2 +- > 7 files changed, 2100 insertions(+), 38 deletions(-) > delete mode 100644 koha-tmpl/intranet-tmpl/lib/require.js > create mode 100644 koha-tmpl/intranet-tmpl/lib/requirejs/.bower.json > create mode 100644 koha-tmpl/intranet-tmpl/lib/requirejs/README.md > create mode 100644 koha-tmpl/intranet-tmpl/lib/requirejs/bower.json > create mode 100644 koha-tmpl/intranet-tmpl/lib/requirejs/require.js > >diff --git a/koha-tmpl/intranet-tmpl/lib/bower.json b/koha-tmpl/intranet-tmpl/lib/bower.json >index c6ec3c3..f070c52 100644 >--- a/koha-tmpl/intranet-tmpl/lib/bower.json >+++ b/koha-tmpl/intranet-tmpl/lib/bower.json >@@ -6,5 +6,8 @@ > "description": "Koha Library Software", > "main": "", > "license": "GPLv3", >- "homepage": "http://koha-community.org" >+ "homepage": "http://koha-community.org", >+ "dependencies": { >+ "requirejs": "2.1.8" >+ } > } >diff --git a/koha-tmpl/intranet-tmpl/lib/require.js b/koha-tmpl/intranet-tmpl/lib/require.js >deleted file mode 100644 >index 7ff409d..0000000 >--- a/koha-tmpl/intranet-tmpl/lib/require.js >+++ /dev/null >@@ -1,36 +0,0 @@ >-/* >- RequireJS 2.1.8 Copyright (c) 2010-2012, The Dojo Foundation All Rights Reserved. >- Available via the MIT or new BSD license. >- see: http://github.com/jrburke/requirejs for details >-*/ >-var requirejs,require,define; >-(function(Z){function H(b){return"[object Function]"===L.call(b)}function I(b){return"[object Array]"===L.call(b)}function y(b,c){if(b){var d;for(d=0;d<b.length&&(!b[d]||!c(b[d],d,b));d+=1);}}function M(b,c){if(b){var d;for(d=b.length-1;-1<d&&(!b[d]||!c(b[d],d,b));d-=1);}}function s(b,c){return ga.call(b,c)}function l(b,c){return s(b,c)&&b[c]}function F(b,c){for(var d in b)if(s(b,d)&&c(b[d],d))break}function Q(b,c,d,h){c&&F(c,function(c,j){if(d||!s(b,j))h&&"string"!==typeof c?(b[j]||(b[j]={}),Q(b[j], >-c,d,h)):b[j]=c});return b}function u(b,c){return function(){return c.apply(b,arguments)}}function aa(b){throw b;}function ba(b){if(!b)return b;var c=Z;y(b.split("."),function(b){c=c[b]});return c}function A(b,c,d,h){c=Error(c+"\nhttp://requirejs.org/docs/errors.html#"+b);c.requireType=b;c.requireModules=h;d&&(c.originalError=d);return c}function ha(b){function c(a,f,b){var e,m,c,g,d,h,j,i=f&&f.split("/");e=i;var n=k.map,p=n&&n["*"];if(a&&"."===a.charAt(0))if(f){e=l(k.pkgs,f)?i=[f]:i.slice(0,i.length- >-1);f=a=e.concat(a.split("/"));for(e=0;f[e];e+=1)if(m=f[e],"."===m)f.splice(e,1),e-=1;else if(".."===m)if(1===e&&(".."===f[2]||".."===f[0]))break;else 0<e&&(f.splice(e-1,2),e-=2);e=l(k.pkgs,f=a[0]);a=a.join("/");e&&a===f+"/"+e.main&&(a=f)}else 0===a.indexOf("./")&&(a=a.substring(2));if(b&&n&&(i||p)){f=a.split("/");for(e=f.length;0<e;e-=1){c=f.slice(0,e).join("/");if(i)for(m=i.length;0<m;m-=1)if(b=l(n,i.slice(0,m).join("/")))if(b=l(b,c)){g=b;d=e;break}if(g)break;!h&&(p&&l(p,c))&&(h=l(p,c),j=e)}!g&& >-h&&(g=h,d=j);g&&(f.splice(0,d,g),a=f.join("/"))}return a}function d(a){z&&y(document.getElementsByTagName("script"),function(f){if(f.getAttribute("data-requiremodule")===a&&f.getAttribute("data-requirecontext")===i.contextName)return f.parentNode.removeChild(f),!0})}function h(a){var f=l(k.paths,a);if(f&&I(f)&&1<f.length)return d(a),f.shift(),i.require.undef(a),i.require([a]),!0}function $(a){var f,b=a?a.indexOf("!"):-1;-1<b&&(f=a.substring(0,b),a=a.substring(b+1,a.length));return[f,a]}function n(a, >-f,b,e){var m,B,g=null,d=f?f.name:null,h=a,j=!0,k="";a||(j=!1,a="_@r"+(L+=1));a=$(a);g=a[0];a=a[1];g&&(g=c(g,d,e),B=l(r,g));a&&(g?k=B&&B.normalize?B.normalize(a,function(a){return c(a,d,e)}):c(a,d,e):(k=c(a,d,e),a=$(k),g=a[0],k=a[1],b=!0,m=i.nameToUrl(k)));b=g&&!B&&!b?"_unnormalized"+(M+=1):"";return{prefix:g,name:k,parentMap:f,unnormalized:!!b,url:m,originalName:h,isDefine:j,id:(g?g+"!"+k:k)+b}}function q(a){var f=a.id,b=l(p,f);b||(b=p[f]=new i.Module(a));return b}function t(a,f,b){var e=a.id,m=l(p, >-e);if(s(r,e)&&(!m||m.defineEmitComplete))"defined"===f&&b(r[e]);else if(m=q(a),m.error&&"error"===f)b(m.error);else m.on(f,b)}function v(a,f){var b=a.requireModules,e=!1;if(f)f(a);else if(y(b,function(f){if(f=l(p,f))f.error=a,f.events.error&&(e=!0,f.emit("error",a))}),!e)j.onError(a)}function w(){R.length&&(ia.apply(G,[G.length-1,0].concat(R)),R=[])}function x(a){delete p[a];delete T[a]}function E(a,f,b){var e=a.map.id;a.error?a.emit("error",a.error):(f[e]=!0,y(a.depMaps,function(e,c){var g=e.id, >-d=l(p,g);d&&(!a.depMatched[c]&&!b[g])&&(l(f,g)?(a.defineDep(c,r[g]),a.check()):E(d,f,b))}),b[e]=!0)}function C(){var a,f,b,e,m=(b=1E3*k.waitSeconds)&&i.startTime+b<(new Date).getTime(),c=[],g=[],j=!1,l=!0;if(!U){U=!0;F(T,function(b){a=b.map;f=a.id;if(b.enabled&&(a.isDefine||g.push(b),!b.error))if(!b.inited&&m)h(f)?j=e=!0:(c.push(f),d(f));else if(!b.inited&&(b.fetched&&a.isDefine)&&(j=!0,!a.prefix))return l=!1});if(m&&c.length)return b=A("timeout","Load timeout for modules: "+c,null,c),b.contextName= >-i.contextName,v(b);l&&y(g,function(a){E(a,{},{})});if((!m||e)&&j)if((z||da)&&!V)V=setTimeout(function(){V=0;C()},50);U=!1}}function D(a){s(r,a[0])||q(n(a[0],null,!0)).init(a[1],a[2])}function J(a){var a=a.currentTarget||a.srcElement,b=i.onScriptLoad;a.detachEvent&&!W?a.detachEvent("onreadystatechange",b):a.removeEventListener("load",b,!1);b=i.onScriptError;(!a.detachEvent||W)&&a.removeEventListener("error",b,!1);return{node:a,id:a&&a.getAttribute("data-requiremodule")}}function K(){var a;for(w();G.length;){a= >-G.shift();if(null===a[0])return v(A("mismatch","Mismatched anonymous define() module: "+a[a.length-1]));D(a)}}var U,X,i,N,V,k={waitSeconds:7,baseUrl:"./",paths:{},pkgs:{},shim:{},config:{}},p={},T={},Y={},G=[],r={},S={},L=1,M=1;N={require:function(a){return a.require?a.require:a.require=i.makeRequire(a.map)},exports:function(a){a.usingExports=!0;if(a.map.isDefine)return a.exports?a.exports:a.exports=r[a.map.id]={}},module:function(a){return a.module?a.module:a.module={id:a.map.id,uri:a.map.url,config:function(){var b= >-l(k.pkgs,a.map.id);return(b?l(k.config,a.map.id+"/"+b.main):l(k.config,a.map.id))||{}},exports:r[a.map.id]}}};X=function(a){this.events=l(Y,a.id)||{};this.map=a;this.shim=l(k.shim,a.id);this.depExports=[];this.depMaps=[];this.depMatched=[];this.pluginMaps={};this.depCount=0};X.prototype={init:function(a,b,c,e){e=e||{};if(!this.inited){this.factory=b;if(c)this.on("error",c);else this.events.error&&(c=u(this,function(a){this.emit("error",a)}));this.depMaps=a&&a.slice(0);this.errback=c;this.inited=!0; >-this.ignore=e.ignore;e.enabled||this.enabled?this.enable():this.check()}},defineDep:function(a,b){this.depMatched[a]||(this.depMatched[a]=!0,this.depCount-=1,this.depExports[a]=b)},fetch:function(){if(!this.fetched){this.fetched=!0;i.startTime=(new Date).getTime();var a=this.map;if(this.shim)i.makeRequire(this.map,{enableBuildCallback:!0})(this.shim.deps||[],u(this,function(){return a.prefix?this.callPlugin():this.load()}));else return a.prefix?this.callPlugin():this.load()}},load:function(){var a= >-this.map.url;S[a]||(S[a]=!0,i.load(this.map.id,a))},check:function(){if(this.enabled&&!this.enabling){var a,b,c=this.map.id;b=this.depExports;var e=this.exports,m=this.factory;if(this.inited)if(this.error)this.emit("error",this.error);else{if(!this.defining){this.defining=!0;if(1>this.depCount&&!this.defined){if(H(m)){if(this.events.error&&this.map.isDefine||j.onError!==aa)try{e=i.execCb(c,m,b,e)}catch(d){a=d}else e=i.execCb(c,m,b,e);this.map.isDefine&&((b=this.module)&&void 0!==b.exports&&b.exports!== >-this.exports?e=b.exports:void 0===e&&this.usingExports&&(e=this.exports));if(a)return a.requireMap=this.map,a.requireModules=this.map.isDefine?[this.map.id]:null,a.requireType=this.map.isDefine?"define":"require",v(this.error=a)}else e=m;this.exports=e;if(this.map.isDefine&&!this.ignore&&(r[c]=e,j.onResourceLoad))j.onResourceLoad(i,this.map,this.depMaps);x(c);this.defined=!0}this.defining=!1;this.defined&&!this.defineEmitted&&(this.defineEmitted=!0,this.emit("defined",this.exports),this.defineEmitComplete= >-!0)}}else this.fetch()}},callPlugin:function(){var a=this.map,b=a.id,d=n(a.prefix);this.depMaps.push(d);t(d,"defined",u(this,function(e){var m,d;d=this.map.name;var g=this.map.parentMap?this.map.parentMap.name:null,h=i.makeRequire(a.parentMap,{enableBuildCallback:!0});if(this.map.unnormalized){if(e.normalize&&(d=e.normalize(d,function(a){return c(a,g,!0)})||""),e=n(a.prefix+"!"+d,this.map.parentMap),t(e,"defined",u(this,function(a){this.init([],function(){return a},null,{enabled:!0,ignore:!0})})), >-d=l(p,e.id)){this.depMaps.push(e);if(this.events.error)d.on("error",u(this,function(a){this.emit("error",a)}));d.enable()}}else m=u(this,function(a){this.init([],function(){return a},null,{enabled:!0})}),m.error=u(this,function(a){this.inited=!0;this.error=a;a.requireModules=[b];F(p,function(a){0===a.map.id.indexOf(b+"_unnormalized")&&x(a.map.id)});v(a)}),m.fromText=u(this,function(e,c){var d=a.name,g=n(d),B=O;c&&(e=c);B&&(O=!1);q(g);s(k.config,b)&&(k.config[d]=k.config[b]);try{j.exec(e)}catch(ca){return v(A("fromtexteval", >-"fromText eval for "+b+" failed: "+ca,ca,[b]))}B&&(O=!0);this.depMaps.push(g);i.completeLoad(d);h([d],m)}),e.load(a.name,h,m,k)}));i.enable(d,this);this.pluginMaps[d.id]=d},enable:function(){T[this.map.id]=this;this.enabling=this.enabled=!0;y(this.depMaps,u(this,function(a,b){var c,e;if("string"===typeof a){a=n(a,this.map.isDefine?this.map:this.map.parentMap,!1,!this.skipMap);this.depMaps[b]=a;if(c=l(N,a.id)){this.depExports[b]=c(this);return}this.depCount+=1;t(a,"defined",u(this,function(a){this.defineDep(b, >-a);this.check()}));this.errback&&t(a,"error",u(this,this.errback))}c=a.id;e=p[c];!s(N,c)&&(e&&!e.enabled)&&i.enable(a,this)}));F(this.pluginMaps,u(this,function(a){var b=l(p,a.id);b&&!b.enabled&&i.enable(a,this)}));this.enabling=!1;this.check()},on:function(a,b){var c=this.events[a];c||(c=this.events[a]=[]);c.push(b)},emit:function(a,b){y(this.events[a],function(a){a(b)});"error"===a&&delete this.events[a]}};i={config:k,contextName:b,registry:p,defined:r,urlFetched:S,defQueue:G,Module:X,makeModuleMap:n, >-nextTick:j.nextTick,onError:v,configure:function(a){a.baseUrl&&"/"!==a.baseUrl.charAt(a.baseUrl.length-1)&&(a.baseUrl+="/");var b=k.pkgs,c=k.shim,e={paths:!0,config:!0,map:!0};F(a,function(a,b){e[b]?"map"===b?(k.map||(k.map={}),Q(k[b],a,!0,!0)):Q(k[b],a,!0):k[b]=a});a.shim&&(F(a.shim,function(a,b){I(a)&&(a={deps:a});if((a.exports||a.init)&&!a.exportsFn)a.exportsFn=i.makeShimExports(a);c[b]=a}),k.shim=c);a.packages&&(y(a.packages,function(a){a="string"===typeof a?{name:a}:a;b[a.name]={name:a.name, >-location:a.location||a.name,main:(a.main||"main").replace(ja,"").replace(ea,"")}}),k.pkgs=b);F(p,function(a,b){!a.inited&&!a.map.unnormalized&&(a.map=n(b))});if(a.deps||a.callback)i.require(a.deps||[],a.callback)},makeShimExports:function(a){return function(){var b;a.init&&(b=a.init.apply(Z,arguments));return b||a.exports&&ba(a.exports)}},makeRequire:function(a,f){function d(e,c,h){var g,k;f.enableBuildCallback&&(c&&H(c))&&(c.__requireJsBuild=!0);if("string"===typeof e){if(H(c))return v(A("requireargs", >-"Invalid require call"),h);if(a&&s(N,e))return N[e](p[a.id]);if(j.get)return j.get(i,e,a,d);g=n(e,a,!1,!0);g=g.id;return!s(r,g)?v(A("notloaded",'Module name "'+g+'" has not been loaded yet for context: '+b+(a?"":". Use require([])"))):r[g]}K();i.nextTick(function(){K();k=q(n(null,a));k.skipMap=f.skipMap;k.init(e,c,h,{enabled:!0});C()});return d}f=f||{};Q(d,{isBrowser:z,toUrl:function(b){var d,f=b.lastIndexOf("."),g=b.split("/")[0];if(-1!==f&&(!("."===g||".."===g)||1<f))d=b.substring(f,b.length),b= >-b.substring(0,f);return i.nameToUrl(c(b,a&&a.id,!0),d,!0)},defined:function(b){return s(r,n(b,a,!1,!0).id)},specified:function(b){b=n(b,a,!1,!0).id;return s(r,b)||s(p,b)}});a||(d.undef=function(b){w();var c=n(b,a,!0),f=l(p,b);delete r[b];delete S[c.url];delete Y[b];f&&(f.events.defined&&(Y[b]=f.events),x(b))});return d},enable:function(a){l(p,a.id)&&q(a).enable()},completeLoad:function(a){var b,c,e=l(k.shim,a)||{},d=e.exports;for(w();G.length;){c=G.shift();if(null===c[0]){c[0]=a;if(b)break;b=!0}else c[0]=== >-a&&(b=!0);D(c)}c=l(p,a);if(!b&&!s(r,a)&&c&&!c.inited){if(k.enforceDefine&&(!d||!ba(d)))return h(a)?void 0:v(A("nodefine","No define call for "+a,null,[a]));D([a,e.deps||[],e.exportsFn])}C()},nameToUrl:function(a,b,c){var e,d,h,g,i,n;if(j.jsExtRegExp.test(a))g=a+(b||"");else{e=k.paths;d=k.pkgs;g=a.split("/");for(i=g.length;0<i;i-=1)if(n=g.slice(0,i).join("/"),h=l(d,n),n=l(e,n)){I(n)&&(n=n[0]);g.splice(0,i,n);break}else if(h){a=a===h.name?h.location+"/"+h.main:h.location;g.splice(0,i,a);break}g=g.join("/"); >-g+=b||(/\?/.test(g)||c?"":".js");g=("/"===g.charAt(0)||g.match(/^[\w\+\.\-]+:/)?"":k.baseUrl)+g}return k.urlArgs?g+((-1===g.indexOf("?")?"?":"&")+k.urlArgs):g},load:function(a,b){j.load(i,a,b)},execCb:function(a,b,c,e){return b.apply(e,c)},onScriptLoad:function(a){if("load"===a.type||ka.test((a.currentTarget||a.srcElement).readyState))P=null,a=J(a),i.completeLoad(a.id)},onScriptError:function(a){var b=J(a);if(!h(b.id))return v(A("scripterror","Script error for: "+b.id,a,[b.id]))}};i.require=i.makeRequire(); >-return i}var j,w,x,C,J,D,P,K,q,fa,la=/(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/mg,ma=/[^.]\s*require\s*\(\s*["']([^'"\s]+)["']\s*\)/g,ea=/\.js$/,ja=/^\.\//;w=Object.prototype;var L=w.toString,ga=w.hasOwnProperty,ia=Array.prototype.splice,z=!!("undefined"!==typeof window&&navigator&&window.document),da=!z&&"undefined"!==typeof importScripts,ka=z&&"PLAYSTATION 3"===navigator.platform?/^complete$/:/^(complete|loaded)$/,W="undefined"!==typeof opera&&"[object Opera]"===opera.toString(),E={},t={},R=[],O= >-!1;if("undefined"===typeof define){if("undefined"!==typeof requirejs){if(H(requirejs))return;t=requirejs;requirejs=void 0}"undefined"!==typeof require&&!H(require)&&(t=require,require=void 0);j=requirejs=function(b,c,d,h){var q,n="_";!I(b)&&"string"!==typeof b&&(q=b,I(c)?(b=c,c=d,d=h):b=[]);q&&q.context&&(n=q.context);(h=l(E,n))||(h=E[n]=j.s.newContext(n));q&&h.configure(q);return h.require(b,c,d)};j.config=function(b){return j(b)};j.nextTick="undefined"!==typeof setTimeout?function(b){setTimeout(b, >-4)}:function(b){b()};require||(require=j);j.version="2.1.8";j.jsExtRegExp=/^\/|:|\?|\.js$/;j.isBrowser=z;w=j.s={contexts:E,newContext:ha};j({});y(["toUrl","undef","defined","specified"],function(b){j[b]=function(){var c=E._;return c.require[b].apply(c,arguments)}});if(z&&(x=w.head=document.getElementsByTagName("head")[0],C=document.getElementsByTagName("base")[0]))x=w.head=C.parentNode;j.onError=aa;j.createNode=function(b){var c=b.xhtml?document.createElementNS("http://www.w3.org/1999/xhtml","html:script"): >-document.createElement("script");c.type=b.scriptType||"text/javascript";c.charset="utf-8";c.async=!0;return c};j.load=function(b,c,d){var h=b&&b.config||{};if(z)return h=j.createNode(h,c,d),h.setAttribute("data-requirecontext",b.contextName),h.setAttribute("data-requiremodule",c),h.attachEvent&&!(h.attachEvent.toString&&0>h.attachEvent.toString().indexOf("[native code"))&&!W?(O=!0,h.attachEvent("onreadystatechange",b.onScriptLoad)):(h.addEventListener("load",b.onScriptLoad,!1),h.addEventListener("error", >-b.onScriptError,!1)),h.src=d,K=h,C?x.insertBefore(h,C):x.appendChild(h),K=null,h;if(da)try{importScripts(d),b.completeLoad(c)}catch(l){b.onError(A("importscripts","importScripts failed for "+c+" at "+d,l,[c]))}};z&&M(document.getElementsByTagName("script"),function(b){x||(x=b.parentNode);if(J=b.getAttribute("data-main"))return q=J,t.baseUrl||(D=q.split("/"),q=D.pop(),fa=D.length?D.join("/")+"/":"./",t.baseUrl=fa),q=q.replace(ea,""),j.jsExtRegExp.test(q)&&(q=J),t.deps=t.deps?t.deps.concat(q):[q],!0}); >-define=function(b,c,d){var h,j;"string"!==typeof b&&(d=c,c=b,b=null);I(c)||(d=c,c=null);!c&&H(d)&&(c=[],d.length&&(d.toString().replace(la,"").replace(ma,function(b,d){c.push(d)}),c=(1===d.length?["require"]:["require","exports","module"]).concat(c)));if(O){if(!(h=K))P&&"interactive"===P.readyState||M(document.getElementsByTagName("script"),function(b){if("interactive"===b.readyState)return P=b}),h=P;h&&(b||(b=h.getAttribute("data-requiremodule")),j=E[h.getAttribute("data-requirecontext")])}(j?j.defQueue: >-R).push([b,c,d])};define.amd={jQuery:!0};j.exec=function(b){return eval(b)};j(t)}})(this); >diff --git a/koha-tmpl/intranet-tmpl/lib/requirejs/.bower.json b/koha-tmpl/intranet-tmpl/lib/requirejs/.bower.json >new file mode 100644 >index 0000000..db69cf2 >--- /dev/null >+++ b/koha-tmpl/intranet-tmpl/lib/requirejs/.bower.json >@@ -0,0 +1,24 @@ >+{ >+ "name": "requirejs", >+ "version": "2.1.8", >+ "homepage": "http://requirejs.org", >+ "authors": [ >+ "jrburke.com" >+ ], >+ "description": "A file and module loader for JavaScript", >+ "main": "require.js", >+ "keywords": [ >+ "AMD" >+ ], >+ "license": "new BSD, and MIT", >+ "_release": "2.1.8", >+ "_resolution": { >+ "type": "version", >+ "tag": "2.1.8", >+ "commit": "9349562f9efe3e53f1379578358c46d6423bddac" >+ }, >+ "_source": "https://github.com/jrburke/requirejs-bower.git", >+ "_target": "2.1.8", >+ "_originalSource": "requirejs", >+ "_direct": true >+} >\ No newline at end of file >diff --git a/koha-tmpl/intranet-tmpl/lib/requirejs/README.md b/koha-tmpl/intranet-tmpl/lib/requirejs/README.md >new file mode 100644 >index 0000000..1fe6a9c >--- /dev/null >+++ b/koha-tmpl/intranet-tmpl/lib/requirejs/README.md >@@ -0,0 +1,4 @@ >+# requirejs-bower >+ >+Bower packaging for [RequireJS](http://requirejs.org). >+ >diff --git a/koha-tmpl/intranet-tmpl/lib/requirejs/bower.json b/koha-tmpl/intranet-tmpl/lib/requirejs/bower.json >new file mode 100644 >index 0000000..a0c456c >--- /dev/null >+++ b/koha-tmpl/intranet-tmpl/lib/requirejs/bower.json >@@ -0,0 +1,14 @@ >+{ >+ "name": "requirejs", >+ "version": "2.1.8", >+ "homepage": "http://requirejs.org", >+ "authors": [ >+ "jrburke.com" >+ ], >+ "description": "A file and module loader for JavaScript", >+ "main": "require.js", >+ "keywords": [ >+ "AMD" >+ ], >+ "license": "new BSD, and MIT" >+} >diff --git a/koha-tmpl/intranet-tmpl/lib/requirejs/require.js b/koha-tmpl/intranet-tmpl/lib/requirejs/require.js >new file mode 100644 >index 0000000..52c2b07 >--- /dev/null >+++ b/koha-tmpl/intranet-tmpl/lib/requirejs/require.js >@@ -0,0 +1,2053 @@ >+/** vim: et:ts=4:sw=4:sts=4 >+ * @license RequireJS 2.1.8 Copyright (c) 2010-2012, The Dojo Foundation All Rights Reserved. >+ * Available via the MIT or new BSD license. >+ * see: http://github.com/jrburke/requirejs for details >+ */ >+//Not using strict: uneven strict support in browsers, #392, and causes >+//problems with requirejs.exec()/transpiler plugins that may not be strict. >+/*jslint regexp: true, nomen: true, sloppy: true */ >+/*global window, navigator, document, importScripts, setTimeout, opera */ >+ >+var requirejs, require, define; >+(function (global) { >+ var req, s, head, baseElement, dataMain, src, >+ interactiveScript, currentlyAddingScript, mainScript, subPath, >+ version = '2.1.8', >+ commentRegExp = /(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/mg, >+ cjsRequireRegExp = /[^.]\s*require\s*\(\s*["']([^'"\s]+)["']\s*\)/g, >+ jsSuffixRegExp = /\.js$/, >+ currDirRegExp = /^\.\//, >+ op = Object.prototype, >+ ostring = op.toString, >+ hasOwn = op.hasOwnProperty, >+ ap = Array.prototype, >+ apsp = ap.splice, >+ isBrowser = !!(typeof window !== 'undefined' && navigator && window.document), >+ isWebWorker = !isBrowser && typeof importScripts !== 'undefined', >+ //PS3 indicates loaded and complete, but need to wait for complete >+ //specifically. Sequence is 'loading', 'loaded', execution, >+ // then 'complete'. The UA check is unfortunate, but not sure how >+ //to feature test w/o causing perf issues. >+ readyRegExp = isBrowser && navigator.platform === 'PLAYSTATION 3' ? >+ /^complete$/ : /^(complete|loaded)$/, >+ defContextName = '_', >+ //Oh the tragedy, detecting opera. See the usage of isOpera for reason. >+ isOpera = typeof opera !== 'undefined' && opera.toString() === '[object Opera]', >+ contexts = {}, >+ cfg = {}, >+ globalDefQueue = [], >+ useInteractive = false; >+ >+ function isFunction(it) { >+ return ostring.call(it) === '[object Function]'; >+ } >+ >+ function isArray(it) { >+ return ostring.call(it) === '[object Array]'; >+ } >+ >+ /** >+ * Helper function for iterating over an array. If the func returns >+ * a true value, it will break out of the loop. >+ */ >+ function each(ary, func) { >+ if (ary) { >+ var i; >+ for (i = 0; i < ary.length; i += 1) { >+ if (ary[i] && func(ary[i], i, ary)) { >+ break; >+ } >+ } >+ } >+ } >+ >+ /** >+ * Helper function for iterating over an array backwards. If the func >+ * returns a true value, it will break out of the loop. >+ */ >+ function eachReverse(ary, func) { >+ if (ary) { >+ var i; >+ for (i = ary.length - 1; i > -1; i -= 1) { >+ if (ary[i] && func(ary[i], i, ary)) { >+ break; >+ } >+ } >+ } >+ } >+ >+ function hasProp(obj, prop) { >+ return hasOwn.call(obj, prop); >+ } >+ >+ function getOwn(obj, prop) { >+ return hasProp(obj, prop) && obj[prop]; >+ } >+ >+ /** >+ * Cycles over properties in an object and calls a function for each >+ * property value. If the function returns a truthy value, then the >+ * iteration is stopped. >+ */ >+ function eachProp(obj, func) { >+ var prop; >+ for (prop in obj) { >+ if (hasProp(obj, prop)) { >+ if (func(obj[prop], prop)) { >+ break; >+ } >+ } >+ } >+ } >+ >+ /** >+ * Simple function to mix in properties from source into target, >+ * but only if target does not already have a property of the same name. >+ */ >+ function mixin(target, source, force, deepStringMixin) { >+ if (source) { >+ eachProp(source, function (value, prop) { >+ if (force || !hasProp(target, prop)) { >+ if (deepStringMixin && typeof value !== 'string') { >+ if (!target[prop]) { >+ target[prop] = {}; >+ } >+ mixin(target[prop], value, force, deepStringMixin); >+ } else { >+ target[prop] = value; >+ } >+ } >+ }); >+ } >+ return target; >+ } >+ >+ //Similar to Function.prototype.bind, but the 'this' object is specified >+ //first, since it is easier to read/figure out what 'this' will be. >+ function bind(obj, fn) { >+ return function () { >+ return fn.apply(obj, arguments); >+ }; >+ } >+ >+ function scripts() { >+ return document.getElementsByTagName('script'); >+ } >+ >+ function defaultOnError(err) { >+ throw err; >+ } >+ >+ //Allow getting a global that expressed in >+ //dot notation, like 'a.b.c'. >+ function getGlobal(value) { >+ if (!value) { >+ return value; >+ } >+ var g = global; >+ each(value.split('.'), function (part) { >+ g = g[part]; >+ }); >+ return g; >+ } >+ >+ /** >+ * Constructs an error with a pointer to an URL with more information. >+ * @param {String} id the error ID that maps to an ID on a web page. >+ * @param {String} message human readable error. >+ * @param {Error} [err] the original error, if there is one. >+ * >+ * @returns {Error} >+ */ >+ function makeError(id, msg, err, requireModules) { >+ var e = new Error(msg + '\nhttp://requirejs.org/docs/errors.html#' + id); >+ e.requireType = id; >+ e.requireModules = requireModules; >+ if (err) { >+ e.originalError = err; >+ } >+ return e; >+ } >+ >+ if (typeof define !== 'undefined') { >+ //If a define is already in play via another AMD loader, >+ //do not overwrite. >+ return; >+ } >+ >+ if (typeof requirejs !== 'undefined') { >+ if (isFunction(requirejs)) { >+ //Do not overwrite and existing requirejs instance. >+ return; >+ } >+ cfg = requirejs; >+ requirejs = undefined; >+ } >+ >+ //Allow for a require config object >+ if (typeof require !== 'undefined' && !isFunction(require)) { >+ //assume it is a config object. >+ cfg = require; >+ require = undefined; >+ } >+ >+ function newContext(contextName) { >+ var inCheckLoaded, Module, context, handlers, >+ checkLoadedTimeoutId, >+ config = { >+ //Defaults. Do not set a default for map >+ //config to speed up normalize(), which >+ //will run faster if there is no default. >+ waitSeconds: 7, >+ baseUrl: './', >+ paths: {}, >+ pkgs: {}, >+ shim: {}, >+ config: {} >+ }, >+ registry = {}, >+ //registry of just enabled modules, to speed >+ //cycle breaking code when lots of modules >+ //are registered, but not activated. >+ enabledRegistry = {}, >+ undefEvents = {}, >+ defQueue = [], >+ defined = {}, >+ urlFetched = {}, >+ requireCounter = 1, >+ unnormalizedCounter = 1; >+ >+ /** >+ * Trims the . and .. from an array of path segments. >+ * It will keep a leading path segment if a .. will become >+ * the first path segment, to help with module name lookups, >+ * which act like paths, but can be remapped. But the end result, >+ * all paths that use this function should look normalized. >+ * NOTE: this method MODIFIES the input array. >+ * @param {Array} ary the array of path segments. >+ */ >+ function trimDots(ary) { >+ var i, part; >+ for (i = 0; ary[i]; i += 1) { >+ part = ary[i]; >+ if (part === '.') { >+ ary.splice(i, 1); >+ i -= 1; >+ } else if (part === '..') { >+ if (i === 1 && (ary[2] === '..' || ary[0] === '..')) { >+ //End of the line. Keep at least one non-dot >+ //path segment at the front so it can be mapped >+ //correctly to disk. Otherwise, there is likely >+ //no path mapping for a path starting with '..'. >+ //This can still fail, but catches the most reasonable >+ //uses of .. >+ break; >+ } else if (i > 0) { >+ ary.splice(i - 1, 2); >+ i -= 2; >+ } >+ } >+ } >+ } >+ >+ /** >+ * Given a relative module name, like ./something, normalize it to >+ * a real name that can be mapped to a path. >+ * @param {String} name the relative name >+ * @param {String} baseName a real name that the name arg is relative >+ * to. >+ * @param {Boolean} applyMap apply the map config to the value. Should >+ * only be done if this normalization is for a dependency ID. >+ * @returns {String} normalized name >+ */ >+ function normalize(name, baseName, applyMap) { >+ var pkgName, pkgConfig, mapValue, nameParts, i, j, nameSegment, >+ foundMap, foundI, foundStarMap, starI, >+ baseParts = baseName && baseName.split('/'), >+ normalizedBaseParts = baseParts, >+ map = config.map, >+ starMap = map && map['*']; >+ >+ //Adjust any relative paths. >+ if (name && name.charAt(0) === '.') { >+ //If have a base name, try to normalize against it, >+ //otherwise, assume it is a top-level require that will >+ //be relative to baseUrl in the end. >+ if (baseName) { >+ if (getOwn(config.pkgs, baseName)) { >+ //If the baseName is a package name, then just treat it as one >+ //name to concat the name with. >+ normalizedBaseParts = baseParts = [baseName]; >+ } else { >+ //Convert baseName to array, and lop off the last part, >+ //so that . matches that 'directory' and not name of the baseName's >+ //module. For instance, baseName of 'one/two/three', maps to >+ //'one/two/three.js', but we want the directory, 'one/two' for >+ //this normalization. >+ normalizedBaseParts = baseParts.slice(0, baseParts.length - 1); >+ } >+ >+ name = normalizedBaseParts.concat(name.split('/')); >+ trimDots(name); >+ >+ //Some use of packages may use a . path to reference the >+ //'main' module name, so normalize for that. >+ pkgConfig = getOwn(config.pkgs, (pkgName = name[0])); >+ name = name.join('/'); >+ if (pkgConfig && name === pkgName + '/' + pkgConfig.main) { >+ name = pkgName; >+ } >+ } else if (name.indexOf('./') === 0) { >+ // No baseName, so this is ID is resolved relative >+ // to baseUrl, pull off the leading dot. >+ name = name.substring(2); >+ } >+ } >+ >+ //Apply map config if available. >+ if (applyMap && map && (baseParts || starMap)) { >+ nameParts = name.split('/'); >+ >+ for (i = nameParts.length; i > 0; i -= 1) { >+ nameSegment = nameParts.slice(0, i).join('/'); >+ >+ if (baseParts) { >+ //Find the longest baseName segment match in the config. >+ //So, do joins on the biggest to smallest lengths of baseParts. >+ for (j = baseParts.length; j > 0; j -= 1) { >+ mapValue = getOwn(map, baseParts.slice(0, j).join('/')); >+ >+ //baseName segment has config, find if it has one for >+ //this name. >+ if (mapValue) { >+ mapValue = getOwn(mapValue, nameSegment); >+ if (mapValue) { >+ //Match, update name to the new value. >+ foundMap = mapValue; >+ foundI = i; >+ break; >+ } >+ } >+ } >+ } >+ >+ if (foundMap) { >+ break; >+ } >+ >+ //Check for a star map match, but just hold on to it, >+ //if there is a shorter segment match later in a matching >+ //config, then favor over this star map. >+ if (!foundStarMap && starMap && getOwn(starMap, nameSegment)) { >+ foundStarMap = getOwn(starMap, nameSegment); >+ starI = i; >+ } >+ } >+ >+ if (!foundMap && foundStarMap) { >+ foundMap = foundStarMap; >+ foundI = starI; >+ } >+ >+ if (foundMap) { >+ nameParts.splice(0, foundI, foundMap); >+ name = nameParts.join('/'); >+ } >+ } >+ >+ return name; >+ } >+ >+ function removeScript(name) { >+ if (isBrowser) { >+ each(scripts(), function (scriptNode) { >+ if (scriptNode.getAttribute('data-requiremodule') === name && >+ scriptNode.getAttribute('data-requirecontext') === context.contextName) { >+ scriptNode.parentNode.removeChild(scriptNode); >+ return true; >+ } >+ }); >+ } >+ } >+ >+ function hasPathFallback(id) { >+ var pathConfig = getOwn(config.paths, id); >+ if (pathConfig && isArray(pathConfig) && pathConfig.length > 1) { >+ removeScript(id); >+ //Pop off the first array value, since it failed, and >+ //retry >+ pathConfig.shift(); >+ context.require.undef(id); >+ context.require([id]); >+ return true; >+ } >+ } >+ >+ //Turns a plugin!resource to [plugin, resource] >+ //with the plugin being undefined if the name >+ //did not have a plugin prefix. >+ function splitPrefix(name) { >+ var prefix, >+ index = name ? name.indexOf('!') : -1; >+ if (index > -1) { >+ prefix = name.substring(0, index); >+ name = name.substring(index + 1, name.length); >+ } >+ return [prefix, name]; >+ } >+ >+ /** >+ * Creates a module mapping that includes plugin prefix, module >+ * name, and path. If parentModuleMap is provided it will >+ * also normalize the name via require.normalize() >+ * >+ * @param {String} name the module name >+ * @param {String} [parentModuleMap] parent module map >+ * for the module name, used to resolve relative names. >+ * @param {Boolean} isNormalized: is the ID already normalized. >+ * This is true if this call is done for a define() module ID. >+ * @param {Boolean} applyMap: apply the map config to the ID. >+ * Should only be true if this map is for a dependency. >+ * >+ * @returns {Object} >+ */ >+ function makeModuleMap(name, parentModuleMap, isNormalized, applyMap) { >+ var url, pluginModule, suffix, nameParts, >+ prefix = null, >+ parentName = parentModuleMap ? parentModuleMap.name : null, >+ originalName = name, >+ isDefine = true, >+ normalizedName = ''; >+ >+ //If no name, then it means it is a require call, generate an >+ //internal name. >+ if (!name) { >+ isDefine = false; >+ name = '_@r' + (requireCounter += 1); >+ } >+ >+ nameParts = splitPrefix(name); >+ prefix = nameParts[0]; >+ name = nameParts[1]; >+ >+ if (prefix) { >+ prefix = normalize(prefix, parentName, applyMap); >+ pluginModule = getOwn(defined, prefix); >+ } >+ >+ //Account for relative paths if there is a base name. >+ if (name) { >+ if (prefix) { >+ if (pluginModule && pluginModule.normalize) { >+ //Plugin is loaded, use its normalize method. >+ normalizedName = pluginModule.normalize(name, function (name) { >+ return normalize(name, parentName, applyMap); >+ }); >+ } else { >+ normalizedName = normalize(name, parentName, applyMap); >+ } >+ } else { >+ //A regular module. >+ normalizedName = normalize(name, parentName, applyMap); >+ >+ //Normalized name may be a plugin ID due to map config >+ //application in normalize. The map config values must >+ //already be normalized, so do not need to redo that part. >+ nameParts = splitPrefix(normalizedName); >+ prefix = nameParts[0]; >+ normalizedName = nameParts[1]; >+ isNormalized = true; >+ >+ url = context.nameToUrl(normalizedName); >+ } >+ } >+ >+ //If the id is a plugin id that cannot be determined if it needs >+ //normalization, stamp it with a unique ID so two matching relative >+ //ids that may conflict can be separate. >+ suffix = prefix && !pluginModule && !isNormalized ? >+ '_unnormalized' + (unnormalizedCounter += 1) : >+ ''; >+ >+ return { >+ prefix: prefix, >+ name: normalizedName, >+ parentMap: parentModuleMap, >+ unnormalized: !!suffix, >+ url: url, >+ originalName: originalName, >+ isDefine: isDefine, >+ id: (prefix ? >+ prefix + '!' + normalizedName : >+ normalizedName) + suffix >+ }; >+ } >+ >+ function getModule(depMap) { >+ var id = depMap.id, >+ mod = getOwn(registry, id); >+ >+ if (!mod) { >+ mod = registry[id] = new context.Module(depMap); >+ } >+ >+ return mod; >+ } >+ >+ function on(depMap, name, fn) { >+ var id = depMap.id, >+ mod = getOwn(registry, id); >+ >+ if (hasProp(defined, id) && >+ (!mod || mod.defineEmitComplete)) { >+ if (name === 'defined') { >+ fn(defined[id]); >+ } >+ } else { >+ mod = getModule(depMap); >+ if (mod.error && name === 'error') { >+ fn(mod.error); >+ } else { >+ mod.on(name, fn); >+ } >+ } >+ } >+ >+ function onError(err, errback) { >+ var ids = err.requireModules, >+ notified = false; >+ >+ if (errback) { >+ errback(err); >+ } else { >+ each(ids, function (id) { >+ var mod = getOwn(registry, id); >+ if (mod) { >+ //Set error on module, so it skips timeout checks. >+ mod.error = err; >+ if (mod.events.error) { >+ notified = true; >+ mod.emit('error', err); >+ } >+ } >+ }); >+ >+ if (!notified) { >+ req.onError(err); >+ } >+ } >+ } >+ >+ /** >+ * Internal method to transfer globalQueue items to this context's >+ * defQueue. >+ */ >+ function takeGlobalQueue() { >+ //Push all the globalDefQueue items into the context's defQueue >+ if (globalDefQueue.length) { >+ //Array splice in the values since the context code has a >+ //local var ref to defQueue, so cannot just reassign the one >+ //on context. >+ apsp.apply(defQueue, >+ [defQueue.length - 1, 0].concat(globalDefQueue)); >+ globalDefQueue = []; >+ } >+ } >+ >+ handlers = { >+ 'require': function (mod) { >+ if (mod.require) { >+ return mod.require; >+ } else { >+ return (mod.require = context.makeRequire(mod.map)); >+ } >+ }, >+ 'exports': function (mod) { >+ mod.usingExports = true; >+ if (mod.map.isDefine) { >+ if (mod.exports) { >+ return mod.exports; >+ } else { >+ return (mod.exports = defined[mod.map.id] = {}); >+ } >+ } >+ }, >+ 'module': function (mod) { >+ if (mod.module) { >+ return mod.module; >+ } else { >+ return (mod.module = { >+ id: mod.map.id, >+ uri: mod.map.url, >+ config: function () { >+ var c, >+ pkg = getOwn(config.pkgs, mod.map.id); >+ // For packages, only support config targeted >+ // at the main module. >+ c = pkg ? getOwn(config.config, mod.map.id + '/' + pkg.main) : >+ getOwn(config.config, mod.map.id); >+ return c || {}; >+ }, >+ exports: defined[mod.map.id] >+ }); >+ } >+ } >+ }; >+ >+ function cleanRegistry(id) { >+ //Clean up machinery used for waiting modules. >+ delete registry[id]; >+ delete enabledRegistry[id]; >+ } >+ >+ function breakCycle(mod, traced, processed) { >+ var id = mod.map.id; >+ >+ if (mod.error) { >+ mod.emit('error', mod.error); >+ } else { >+ traced[id] = true; >+ each(mod.depMaps, function (depMap, i) { >+ var depId = depMap.id, >+ dep = getOwn(registry, depId); >+ >+ //Only force things that have not completed >+ //being defined, so still in the registry, >+ //and only if it has not been matched up >+ //in the module already. >+ if (dep && !mod.depMatched[i] && !processed[depId]) { >+ if (getOwn(traced, depId)) { >+ mod.defineDep(i, defined[depId]); >+ mod.check(); //pass false? >+ } else { >+ breakCycle(dep, traced, processed); >+ } >+ } >+ }); >+ processed[id] = true; >+ } >+ } >+ >+ function checkLoaded() { >+ var map, modId, err, usingPathFallback, >+ waitInterval = config.waitSeconds * 1000, >+ //It is possible to disable the wait interval by using waitSeconds of 0. >+ expired = waitInterval && (context.startTime + waitInterval) < new Date().getTime(), >+ noLoads = [], >+ reqCalls = [], >+ stillLoading = false, >+ needCycleCheck = true; >+ >+ //Do not bother if this call was a result of a cycle break. >+ if (inCheckLoaded) { >+ return; >+ } >+ >+ inCheckLoaded = true; >+ >+ //Figure out the state of all the modules. >+ eachProp(enabledRegistry, function (mod) { >+ map = mod.map; >+ modId = map.id; >+ >+ //Skip things that are not enabled or in error state. >+ if (!mod.enabled) { >+ return; >+ } >+ >+ if (!map.isDefine) { >+ reqCalls.push(mod); >+ } >+ >+ if (!mod.error) { >+ //If the module should be executed, and it has not >+ //been inited and time is up, remember it. >+ if (!mod.inited && expired) { >+ if (hasPathFallback(modId)) { >+ usingPathFallback = true; >+ stillLoading = true; >+ } else { >+ noLoads.push(modId); >+ removeScript(modId); >+ } >+ } else if (!mod.inited && mod.fetched && map.isDefine) { >+ stillLoading = true; >+ if (!map.prefix) { >+ //No reason to keep looking for unfinished >+ //loading. If the only stillLoading is a >+ //plugin resource though, keep going, >+ //because it may be that a plugin resource >+ //is waiting on a non-plugin cycle. >+ return (needCycleCheck = false); >+ } >+ } >+ } >+ }); >+ >+ if (expired && noLoads.length) { >+ //If wait time expired, throw error of unloaded modules. >+ err = makeError('timeout', 'Load timeout for modules: ' + noLoads, null, noLoads); >+ err.contextName = context.contextName; >+ return onError(err); >+ } >+ >+ //Not expired, check for a cycle. >+ if (needCycleCheck) { >+ each(reqCalls, function (mod) { >+ breakCycle(mod, {}, {}); >+ }); >+ } >+ >+ //If still waiting on loads, and the waiting load is something >+ //other than a plugin resource, or there are still outstanding >+ //scripts, then just try back later. >+ if ((!expired || usingPathFallback) && stillLoading) { >+ //Something is still waiting to load. Wait for it, but only >+ //if a timeout is not already in effect. >+ if ((isBrowser || isWebWorker) && !checkLoadedTimeoutId) { >+ checkLoadedTimeoutId = setTimeout(function () { >+ checkLoadedTimeoutId = 0; >+ checkLoaded(); >+ }, 50); >+ } >+ } >+ >+ inCheckLoaded = false; >+ } >+ >+ Module = function (map) { >+ this.events = getOwn(undefEvents, map.id) || {}; >+ this.map = map; >+ this.shim = getOwn(config.shim, map.id); >+ this.depExports = []; >+ this.depMaps = []; >+ this.depMatched = []; >+ this.pluginMaps = {}; >+ this.depCount = 0; >+ >+ /* this.exports this.factory >+ this.depMaps = [], >+ this.enabled, this.fetched >+ */ >+ }; >+ >+ Module.prototype = { >+ init: function (depMaps, factory, errback, options) { >+ options = options || {}; >+ >+ //Do not do more inits if already done. Can happen if there >+ //are multiple define calls for the same module. That is not >+ //a normal, common case, but it is also not unexpected. >+ if (this.inited) { >+ return; >+ } >+ >+ this.factory = factory; >+ >+ if (errback) { >+ //Register for errors on this module. >+ this.on('error', errback); >+ } else if (this.events.error) { >+ //If no errback already, but there are error listeners >+ //on this module, set up an errback to pass to the deps. >+ errback = bind(this, function (err) { >+ this.emit('error', err); >+ }); >+ } >+ >+ //Do a copy of the dependency array, so that >+ //source inputs are not modified. For example >+ //"shim" deps are passed in here directly, and >+ //doing a direct modification of the depMaps array >+ //would affect that config. >+ this.depMaps = depMaps && depMaps.slice(0); >+ >+ this.errback = errback; >+ >+ //Indicate this module has be initialized >+ this.inited = true; >+ >+ this.ignore = options.ignore; >+ >+ //Could have option to init this module in enabled mode, >+ //or could have been previously marked as enabled. However, >+ //the dependencies are not known until init is called. So >+ //if enabled previously, now trigger dependencies as enabled. >+ if (options.enabled || this.enabled) { >+ //Enable this module and dependencies. >+ //Will call this.check() >+ this.enable(); >+ } else { >+ this.check(); >+ } >+ }, >+ >+ defineDep: function (i, depExports) { >+ //Because of cycles, defined callback for a given >+ //export can be called more than once. >+ if (!this.depMatched[i]) { >+ this.depMatched[i] = true; >+ this.depCount -= 1; >+ this.depExports[i] = depExports; >+ } >+ }, >+ >+ fetch: function () { >+ if (this.fetched) { >+ return; >+ } >+ this.fetched = true; >+ >+ context.startTime = (new Date()).getTime(); >+ >+ var map = this.map; >+ >+ //If the manager is for a plugin managed resource, >+ //ask the plugin to load it now. >+ if (this.shim) { >+ context.makeRequire(this.map, { >+ enableBuildCallback: true >+ })(this.shim.deps || [], bind(this, function () { >+ return map.prefix ? this.callPlugin() : this.load(); >+ })); >+ } else { >+ //Regular dependency. >+ return map.prefix ? this.callPlugin() : this.load(); >+ } >+ }, >+ >+ load: function () { >+ var url = this.map.url; >+ >+ //Regular dependency. >+ if (!urlFetched[url]) { >+ urlFetched[url] = true; >+ context.load(this.map.id, url); >+ } >+ }, >+ >+ /** >+ * Checks if the module is ready to define itself, and if so, >+ * define it. >+ */ >+ check: function () { >+ if (!this.enabled || this.enabling) { >+ return; >+ } >+ >+ var err, cjsModule, >+ id = this.map.id, >+ depExports = this.depExports, >+ exports = this.exports, >+ factory = this.factory; >+ >+ if (!this.inited) { >+ this.fetch(); >+ } else if (this.error) { >+ this.emit('error', this.error); >+ } else if (!this.defining) { >+ //The factory could trigger another require call >+ //that would result in checking this module to >+ //define itself again. If already in the process >+ //of doing that, skip this work. >+ this.defining = true; >+ >+ if (this.depCount < 1 && !this.defined) { >+ if (isFunction(factory)) { >+ //If there is an error listener, favor passing >+ //to that instead of throwing an error. However, >+ //only do it for define()'d modules. require >+ //errbacks should not be called for failures in >+ //their callbacks (#699). However if a global >+ //onError is set, use that. >+ if ((this.events.error && this.map.isDefine) || >+ req.onError !== defaultOnError) { >+ try { >+ exports = context.execCb(id, factory, depExports, exports); >+ } catch (e) { >+ err = e; >+ } >+ } else { >+ exports = context.execCb(id, factory, depExports, exports); >+ } >+ >+ if (this.map.isDefine) { >+ //If setting exports via 'module' is in play, >+ //favor that over return value and exports. After that, >+ //favor a non-undefined return value over exports use. >+ cjsModule = this.module; >+ if (cjsModule && >+ cjsModule.exports !== undefined && >+ //Make sure it is not already the exports value >+ cjsModule.exports !== this.exports) { >+ exports = cjsModule.exports; >+ } else if (exports === undefined && this.usingExports) { >+ //exports already set the defined value. >+ exports = this.exports; >+ } >+ } >+ >+ if (err) { >+ err.requireMap = this.map; >+ err.requireModules = this.map.isDefine ? [this.map.id] : null; >+ err.requireType = this.map.isDefine ? 'define' : 'require'; >+ return onError((this.error = err)); >+ } >+ >+ } else { >+ //Just a literal value >+ exports = factory; >+ } >+ >+ this.exports = exports; >+ >+ if (this.map.isDefine && !this.ignore) { >+ defined[id] = exports; >+ >+ if (req.onResourceLoad) { >+ req.onResourceLoad(context, this.map, this.depMaps); >+ } >+ } >+ >+ //Clean up >+ cleanRegistry(id); >+ >+ this.defined = true; >+ } >+ >+ //Finished the define stage. Allow calling check again >+ //to allow define notifications below in the case of a >+ //cycle. >+ this.defining = false; >+ >+ if (this.defined && !this.defineEmitted) { >+ this.defineEmitted = true; >+ this.emit('defined', this.exports); >+ this.defineEmitComplete = true; >+ } >+ >+ } >+ }, >+ >+ callPlugin: function () { >+ var map = this.map, >+ id = map.id, >+ //Map already normalized the prefix. >+ pluginMap = makeModuleMap(map.prefix); >+ >+ //Mark this as a dependency for this plugin, so it >+ //can be traced for cycles. >+ this.depMaps.push(pluginMap); >+ >+ on(pluginMap, 'defined', bind(this, function (plugin) { >+ var load, normalizedMap, normalizedMod, >+ name = this.map.name, >+ parentName = this.map.parentMap ? this.map.parentMap.name : null, >+ localRequire = context.makeRequire(map.parentMap, { >+ enableBuildCallback: true >+ }); >+ >+ //If current map is not normalized, wait for that >+ //normalized name to load instead of continuing. >+ if (this.map.unnormalized) { >+ //Normalize the ID if the plugin allows it. >+ if (plugin.normalize) { >+ name = plugin.normalize(name, function (name) { >+ return normalize(name, parentName, true); >+ }) || ''; >+ } >+ >+ //prefix and name should already be normalized, no need >+ //for applying map config again either. >+ normalizedMap = makeModuleMap(map.prefix + '!' + name, >+ this.map.parentMap); >+ on(normalizedMap, >+ 'defined', bind(this, function (value) { >+ this.init([], function () { return value; }, null, { >+ enabled: true, >+ ignore: true >+ }); >+ })); >+ >+ normalizedMod = getOwn(registry, normalizedMap.id); >+ if (normalizedMod) { >+ //Mark this as a dependency for this plugin, so it >+ //can be traced for cycles. >+ this.depMaps.push(normalizedMap); >+ >+ if (this.events.error) { >+ normalizedMod.on('error', bind(this, function (err) { >+ this.emit('error', err); >+ })); >+ } >+ normalizedMod.enable(); >+ } >+ >+ return; >+ } >+ >+ load = bind(this, function (value) { >+ this.init([], function () { return value; }, null, { >+ enabled: true >+ }); >+ }); >+ >+ load.error = bind(this, function (err) { >+ this.inited = true; >+ this.error = err; >+ err.requireModules = [id]; >+ >+ //Remove temp unnormalized modules for this module, >+ //since they will never be resolved otherwise now. >+ eachProp(registry, function (mod) { >+ if (mod.map.id.indexOf(id + '_unnormalized') === 0) { >+ cleanRegistry(mod.map.id); >+ } >+ }); >+ >+ onError(err); >+ }); >+ >+ //Allow plugins to load other code without having to know the >+ //context or how to 'complete' the load. >+ load.fromText = bind(this, function (text, textAlt) { >+ /*jslint evil: true */ >+ var moduleName = map.name, >+ moduleMap = makeModuleMap(moduleName), >+ hasInteractive = useInteractive; >+ >+ //As of 2.1.0, support just passing the text, to reinforce >+ //fromText only being called once per resource. Still >+ //support old style of passing moduleName but discard >+ //that moduleName in favor of the internal ref. >+ if (textAlt) { >+ text = textAlt; >+ } >+ >+ //Turn off interactive script matching for IE for any define >+ //calls in the text, then turn it back on at the end. >+ if (hasInteractive) { >+ useInteractive = false; >+ } >+ >+ //Prime the system by creating a module instance for >+ //it. >+ getModule(moduleMap); >+ >+ //Transfer any config to this other module. >+ if (hasProp(config.config, id)) { >+ config.config[moduleName] = config.config[id]; >+ } >+ >+ try { >+ req.exec(text); >+ } catch (e) { >+ return onError(makeError('fromtexteval', >+ 'fromText eval for ' + id + >+ ' failed: ' + e, >+ e, >+ [id])); >+ } >+ >+ if (hasInteractive) { >+ useInteractive = true; >+ } >+ >+ //Mark this as a dependency for the plugin >+ //resource >+ this.depMaps.push(moduleMap); >+ >+ //Support anonymous modules. >+ context.completeLoad(moduleName); >+ >+ //Bind the value of that module to the value for this >+ //resource ID. >+ localRequire([moduleName], load); >+ }); >+ >+ //Use parentName here since the plugin's name is not reliable, >+ //could be some weird string with no path that actually wants to >+ //reference the parentName's path. >+ plugin.load(map.name, localRequire, load, config); >+ })); >+ >+ context.enable(pluginMap, this); >+ this.pluginMaps[pluginMap.id] = pluginMap; >+ }, >+ >+ enable: function () { >+ enabledRegistry[this.map.id] = this; >+ this.enabled = true; >+ >+ //Set flag mentioning that the module is enabling, >+ //so that immediate calls to the defined callbacks >+ //for dependencies do not trigger inadvertent load >+ //with the depCount still being zero. >+ this.enabling = true; >+ >+ //Enable each dependency >+ each(this.depMaps, bind(this, function (depMap, i) { >+ var id, mod, handler; >+ >+ if (typeof depMap === 'string') { >+ //Dependency needs to be converted to a depMap >+ //and wired up to this module. >+ depMap = makeModuleMap(depMap, >+ (this.map.isDefine ? this.map : this.map.parentMap), >+ false, >+ !this.skipMap); >+ this.depMaps[i] = depMap; >+ >+ handler = getOwn(handlers, depMap.id); >+ >+ if (handler) { >+ this.depExports[i] = handler(this); >+ return; >+ } >+ >+ this.depCount += 1; >+ >+ on(depMap, 'defined', bind(this, function (depExports) { >+ this.defineDep(i, depExports); >+ this.check(); >+ })); >+ >+ if (this.errback) { >+ on(depMap, 'error', bind(this, this.errback)); >+ } >+ } >+ >+ id = depMap.id; >+ mod = registry[id]; >+ >+ //Skip special modules like 'require', 'exports', 'module' >+ //Also, don't call enable if it is already enabled, >+ //important in circular dependency cases. >+ if (!hasProp(handlers, id) && mod && !mod.enabled) { >+ context.enable(depMap, this); >+ } >+ })); >+ >+ //Enable each plugin that is used in >+ //a dependency >+ eachProp(this.pluginMaps, bind(this, function (pluginMap) { >+ var mod = getOwn(registry, pluginMap.id); >+ if (mod && !mod.enabled) { >+ context.enable(pluginMap, this); >+ } >+ })); >+ >+ this.enabling = false; >+ >+ this.check(); >+ }, >+ >+ on: function (name, cb) { >+ var cbs = this.events[name]; >+ if (!cbs) { >+ cbs = this.events[name] = []; >+ } >+ cbs.push(cb); >+ }, >+ >+ emit: function (name, evt) { >+ each(this.events[name], function (cb) { >+ cb(evt); >+ }); >+ if (name === 'error') { >+ //Now that the error handler was triggered, remove >+ //the listeners, since this broken Module instance >+ //can stay around for a while in the registry. >+ delete this.events[name]; >+ } >+ } >+ }; >+ >+ function callGetModule(args) { >+ //Skip modules already defined. >+ if (!hasProp(defined, args[0])) { >+ getModule(makeModuleMap(args[0], null, true)).init(args[1], args[2]); >+ } >+ } >+ >+ function removeListener(node, func, name, ieName) { >+ //Favor detachEvent because of IE9 >+ //issue, see attachEvent/addEventListener comment elsewhere >+ //in this file. >+ if (node.detachEvent && !isOpera) { >+ //Probably IE. If not it will throw an error, which will be >+ //useful to know. >+ if (ieName) { >+ node.detachEvent(ieName, func); >+ } >+ } else { >+ node.removeEventListener(name, func, false); >+ } >+ } >+ >+ /** >+ * Given an event from a script node, get the requirejs info from it, >+ * and then removes the event listeners on the node. >+ * @param {Event} evt >+ * @returns {Object} >+ */ >+ function getScriptData(evt) { >+ //Using currentTarget instead of target for Firefox 2.0's sake. Not >+ //all old browsers will be supported, but this one was easy enough >+ //to support and still makes sense. >+ var node = evt.currentTarget || evt.srcElement; >+ >+ //Remove the listeners once here. >+ removeListener(node, context.onScriptLoad, 'load', 'onreadystatechange'); >+ removeListener(node, context.onScriptError, 'error'); >+ >+ return { >+ node: node, >+ id: node && node.getAttribute('data-requiremodule') >+ }; >+ } >+ >+ function intakeDefines() { >+ var args; >+ >+ //Any defined modules in the global queue, intake them now. >+ takeGlobalQueue(); >+ >+ //Make sure any remaining defQueue items get properly processed. >+ while (defQueue.length) { >+ args = defQueue.shift(); >+ if (args[0] === null) { >+ return onError(makeError('mismatch', 'Mismatched anonymous define() module: ' + args[args.length - 1])); >+ } else { >+ //args are id, deps, factory. Should be normalized by the >+ //define() function. >+ callGetModule(args); >+ } >+ } >+ } >+ >+ context = { >+ config: config, >+ contextName: contextName, >+ registry: registry, >+ defined: defined, >+ urlFetched: urlFetched, >+ defQueue: defQueue, >+ Module: Module, >+ makeModuleMap: makeModuleMap, >+ nextTick: req.nextTick, >+ onError: onError, >+ >+ /** >+ * Set a configuration for the context. >+ * @param {Object} cfg config object to integrate. >+ */ >+ configure: function (cfg) { >+ //Make sure the baseUrl ends in a slash. >+ if (cfg.baseUrl) { >+ if (cfg.baseUrl.charAt(cfg.baseUrl.length - 1) !== '/') { >+ cfg.baseUrl += '/'; >+ } >+ } >+ >+ //Save off the paths and packages since they require special processing, >+ //they are additive. >+ var pkgs = config.pkgs, >+ shim = config.shim, >+ objs = { >+ paths: true, >+ config: true, >+ map: true >+ }; >+ >+ eachProp(cfg, function (value, prop) { >+ if (objs[prop]) { >+ if (prop === 'map') { >+ if (!config.map) { >+ config.map = {}; >+ } >+ mixin(config[prop], value, true, true); >+ } else { >+ mixin(config[prop], value, true); >+ } >+ } else { >+ config[prop] = value; >+ } >+ }); >+ >+ //Merge shim >+ if (cfg.shim) { >+ eachProp(cfg.shim, function (value, id) { >+ //Normalize the structure >+ if (isArray(value)) { >+ value = { >+ deps: value >+ }; >+ } >+ if ((value.exports || value.init) && !value.exportsFn) { >+ value.exportsFn = context.makeShimExports(value); >+ } >+ shim[id] = value; >+ }); >+ config.shim = shim; >+ } >+ >+ //Adjust packages if necessary. >+ if (cfg.packages) { >+ each(cfg.packages, function (pkgObj) { >+ var location; >+ >+ pkgObj = typeof pkgObj === 'string' ? { name: pkgObj } : pkgObj; >+ location = pkgObj.location; >+ >+ //Create a brand new object on pkgs, since currentPackages can >+ //be passed in again, and config.pkgs is the internal transformed >+ //state for all package configs. >+ pkgs[pkgObj.name] = { >+ name: pkgObj.name, >+ location: location || pkgObj.name, >+ //Remove leading dot in main, so main paths are normalized, >+ //and remove any trailing .js, since different package >+ //envs have different conventions: some use a module name, >+ //some use a file name. >+ main: (pkgObj.main || 'main') >+ .replace(currDirRegExp, '') >+ .replace(jsSuffixRegExp, '') >+ }; >+ }); >+ >+ //Done with modifications, assing packages back to context config >+ config.pkgs = pkgs; >+ } >+ >+ //If there are any "waiting to execute" modules in the registry, >+ //update the maps for them, since their info, like URLs to load, >+ //may have changed. >+ eachProp(registry, function (mod, id) { >+ //If module already has init called, since it is too >+ //late to modify them, and ignore unnormalized ones >+ //since they are transient. >+ if (!mod.inited && !mod.map.unnormalized) { >+ mod.map = makeModuleMap(id); >+ } >+ }); >+ >+ //If a deps array or a config callback is specified, then call >+ //require with those args. This is useful when require is defined as a >+ //config object before require.js is loaded. >+ if (cfg.deps || cfg.callback) { >+ context.require(cfg.deps || [], cfg.callback); >+ } >+ }, >+ >+ makeShimExports: function (value) { >+ function fn() { >+ var ret; >+ if (value.init) { >+ ret = value.init.apply(global, arguments); >+ } >+ return ret || (value.exports && getGlobal(value.exports)); >+ } >+ return fn; >+ }, >+ >+ makeRequire: function (relMap, options) { >+ options = options || {}; >+ >+ function localRequire(deps, callback, errback) { >+ var id, map, requireMod; >+ >+ if (options.enableBuildCallback && callback && isFunction(callback)) { >+ callback.__requireJsBuild = true; >+ } >+ >+ if (typeof deps === 'string') { >+ if (isFunction(callback)) { >+ //Invalid call >+ return onError(makeError('requireargs', 'Invalid require call'), errback); >+ } >+ >+ //If require|exports|module are requested, get the >+ //value for them from the special handlers. Caveat: >+ //this only works while module is being defined. >+ if (relMap && hasProp(handlers, deps)) { >+ return handlers[deps](registry[relMap.id]); >+ } >+ >+ //Synchronous access to one module. If require.get is >+ //available (as in the Node adapter), prefer that. >+ if (req.get) { >+ return req.get(context, deps, relMap, localRequire); >+ } >+ >+ //Normalize module name, if it contains . or .. >+ map = makeModuleMap(deps, relMap, false, true); >+ id = map.id; >+ >+ if (!hasProp(defined, id)) { >+ return onError(makeError('notloaded', 'Module name "' + >+ id + >+ '" has not been loaded yet for context: ' + >+ contextName + >+ (relMap ? '' : '. Use require([])'))); >+ } >+ return defined[id]; >+ } >+ >+ //Grab defines waiting in the global queue. >+ intakeDefines(); >+ >+ //Mark all the dependencies as needing to be loaded. >+ context.nextTick(function () { >+ //Some defines could have been added since the >+ //require call, collect them. >+ intakeDefines(); >+ >+ requireMod = getModule(makeModuleMap(null, relMap)); >+ >+ //Store if map config should be applied to this require >+ //call for dependencies. >+ requireMod.skipMap = options.skipMap; >+ >+ requireMod.init(deps, callback, errback, { >+ enabled: true >+ }); >+ >+ checkLoaded(); >+ }); >+ >+ return localRequire; >+ } >+ >+ mixin(localRequire, { >+ isBrowser: isBrowser, >+ >+ /** >+ * Converts a module name + .extension into an URL path. >+ * *Requires* the use of a module name. It does not support using >+ * plain URLs like nameToUrl. >+ */ >+ toUrl: function (moduleNamePlusExt) { >+ var ext, >+ index = moduleNamePlusExt.lastIndexOf('.'), >+ segment = moduleNamePlusExt.split('/')[0], >+ isRelative = segment === '.' || segment === '..'; >+ >+ //Have a file extension alias, and it is not the >+ //dots from a relative path. >+ if (index !== -1 && (!isRelative || index > 1)) { >+ ext = moduleNamePlusExt.substring(index, moduleNamePlusExt.length); >+ moduleNamePlusExt = moduleNamePlusExt.substring(0, index); >+ } >+ >+ return context.nameToUrl(normalize(moduleNamePlusExt, >+ relMap && relMap.id, true), ext, true); >+ }, >+ >+ defined: function (id) { >+ return hasProp(defined, makeModuleMap(id, relMap, false, true).id); >+ }, >+ >+ specified: function (id) { >+ id = makeModuleMap(id, relMap, false, true).id; >+ return hasProp(defined, id) || hasProp(registry, id); >+ } >+ }); >+ >+ //Only allow undef on top level require calls >+ if (!relMap) { >+ localRequire.undef = function (id) { >+ //Bind any waiting define() calls to this context, >+ //fix for #408 >+ takeGlobalQueue(); >+ >+ var map = makeModuleMap(id, relMap, true), >+ mod = getOwn(registry, id); >+ >+ delete defined[id]; >+ delete urlFetched[map.url]; >+ delete undefEvents[id]; >+ >+ if (mod) { >+ //Hold on to listeners in case the >+ //module will be attempted to be reloaded >+ //using a different config. >+ if (mod.events.defined) { >+ undefEvents[id] = mod.events; >+ } >+ >+ cleanRegistry(id); >+ } >+ }; >+ } >+ >+ return localRequire; >+ }, >+ >+ /** >+ * Called to enable a module if it is still in the registry >+ * awaiting enablement. A second arg, parent, the parent module, >+ * is passed in for context, when this method is overriden by >+ * the optimizer. Not shown here to keep code compact. >+ */ >+ enable: function (depMap) { >+ var mod = getOwn(registry, depMap.id); >+ if (mod) { >+ getModule(depMap).enable(); >+ } >+ }, >+ >+ /** >+ * Internal method used by environment adapters to complete a load event. >+ * A load event could be a script load or just a load pass from a synchronous >+ * load call. >+ * @param {String} moduleName the name of the module to potentially complete. >+ */ >+ completeLoad: function (moduleName) { >+ var found, args, mod, >+ shim = getOwn(config.shim, moduleName) || {}, >+ shExports = shim.exports; >+ >+ takeGlobalQueue(); >+ >+ while (defQueue.length) { >+ args = defQueue.shift(); >+ if (args[0] === null) { >+ args[0] = moduleName; >+ //If already found an anonymous module and bound it >+ //to this name, then this is some other anon module >+ //waiting for its completeLoad to fire. >+ if (found) { >+ break; >+ } >+ found = true; >+ } else if (args[0] === moduleName) { >+ //Found matching define call for this script! >+ found = true; >+ } >+ >+ callGetModule(args); >+ } >+ >+ //Do this after the cycle of callGetModule in case the result >+ //of those calls/init calls changes the registry. >+ mod = getOwn(registry, moduleName); >+ >+ if (!found && !hasProp(defined, moduleName) && mod && !mod.inited) { >+ if (config.enforceDefine && (!shExports || !getGlobal(shExports))) { >+ if (hasPathFallback(moduleName)) { >+ return; >+ } else { >+ return onError(makeError('nodefine', >+ 'No define call for ' + moduleName, >+ null, >+ [moduleName])); >+ } >+ } else { >+ //A script that does not call define(), so just simulate >+ //the call for it. >+ callGetModule([moduleName, (shim.deps || []), shim.exportsFn]); >+ } >+ } >+ >+ checkLoaded(); >+ }, >+ >+ /** >+ * Converts a module name to a file path. Supports cases where >+ * moduleName may actually be just an URL. >+ * Note that it **does not** call normalize on the moduleName, >+ * it is assumed to have already been normalized. This is an >+ * internal API, not a public one. Use toUrl for the public API. >+ */ >+ nameToUrl: function (moduleName, ext, skipExt) { >+ var paths, pkgs, pkg, pkgPath, syms, i, parentModule, url, >+ parentPath; >+ >+ //If a colon is in the URL, it indicates a protocol is used and it is just >+ //an URL to a file, or if it starts with a slash, contains a query arg (i.e. ?) >+ //or ends with .js, then assume the user meant to use an url and not a module id. >+ //The slash is important for protocol-less URLs as well as full paths. >+ if (req.jsExtRegExp.test(moduleName)) { >+ //Just a plain path, not module name lookup, so just return it. >+ //Add extension if it is included. This is a bit wonky, only non-.js things pass >+ //an extension, this method probably needs to be reworked. >+ url = moduleName + (ext || ''); >+ } else { >+ //A module that needs to be converted to a path. >+ paths = config.paths; >+ pkgs = config.pkgs; >+ >+ syms = moduleName.split('/'); >+ //For each module name segment, see if there is a path >+ //registered for it. Start with most specific name >+ //and work up from it. >+ for (i = syms.length; i > 0; i -= 1) { >+ parentModule = syms.slice(0, i).join('/'); >+ pkg = getOwn(pkgs, parentModule); >+ parentPath = getOwn(paths, parentModule); >+ if (parentPath) { >+ //If an array, it means there are a few choices, >+ //Choose the one that is desired >+ if (isArray(parentPath)) { >+ parentPath = parentPath[0]; >+ } >+ syms.splice(0, i, parentPath); >+ break; >+ } else if (pkg) { >+ //If module name is just the package name, then looking >+ //for the main module. >+ if (moduleName === pkg.name) { >+ pkgPath = pkg.location + '/' + pkg.main; >+ } else { >+ pkgPath = pkg.location; >+ } >+ syms.splice(0, i, pkgPath); >+ break; >+ } >+ } >+ >+ //Join the path parts together, then figure out if baseUrl is needed. >+ url = syms.join('/'); >+ url += (ext || (/\?/.test(url) || skipExt ? '' : '.js')); >+ url = (url.charAt(0) === '/' || url.match(/^[\w\+\.\-]+:/) ? '' : config.baseUrl) + url; >+ } >+ >+ return config.urlArgs ? url + >+ ((url.indexOf('?') === -1 ? '?' : '&') + >+ config.urlArgs) : url; >+ }, >+ >+ //Delegates to req.load. Broken out as a separate function to >+ //allow overriding in the optimizer. >+ load: function (id, url) { >+ req.load(context, id, url); >+ }, >+ >+ /** >+ * Executes a module callback function. Broken out as a separate function >+ * solely to allow the build system to sequence the files in the built >+ * layer in the right sequence. >+ * >+ * @private >+ */ >+ execCb: function (name, callback, args, exports) { >+ return callback.apply(exports, args); >+ }, >+ >+ /** >+ * callback for script loads, used to check status of loading. >+ * >+ * @param {Event} evt the event from the browser for the script >+ * that was loaded. >+ */ >+ onScriptLoad: function (evt) { >+ //Using currentTarget instead of target for Firefox 2.0's sake. Not >+ //all old browsers will be supported, but this one was easy enough >+ //to support and still makes sense. >+ if (evt.type === 'load' || >+ (readyRegExp.test((evt.currentTarget || evt.srcElement).readyState))) { >+ //Reset interactive script so a script node is not held onto for >+ //to long. >+ interactiveScript = null; >+ >+ //Pull out the name of the module and the context. >+ var data = getScriptData(evt); >+ context.completeLoad(data.id); >+ } >+ }, >+ >+ /** >+ * Callback for script errors. >+ */ >+ onScriptError: function (evt) { >+ var data = getScriptData(evt); >+ if (!hasPathFallback(data.id)) { >+ return onError(makeError('scripterror', 'Script error for: ' + data.id, evt, [data.id])); >+ } >+ } >+ }; >+ >+ context.require = context.makeRequire(); >+ return context; >+ } >+ >+ /** >+ * Main entry point. >+ * >+ * If the only argument to require is a string, then the module that >+ * is represented by that string is fetched for the appropriate context. >+ * >+ * If the first argument is an array, then it will be treated as an array >+ * of dependency string names to fetch. An optional function callback can >+ * be specified to execute when all of those dependencies are available. >+ * >+ * Make a local req variable to help Caja compliance (it assumes things >+ * on a require that are not standardized), and to give a short >+ * name for minification/local scope use. >+ */ >+ req = requirejs = function (deps, callback, errback, optional) { >+ >+ //Find the right context, use default >+ var context, config, >+ contextName = defContextName; >+ >+ // Determine if have config object in the call. >+ if (!isArray(deps) && typeof deps !== 'string') { >+ // deps is a config object >+ config = deps; >+ if (isArray(callback)) { >+ // Adjust args if there are dependencies >+ deps = callback; >+ callback = errback; >+ errback = optional; >+ } else { >+ deps = []; >+ } >+ } >+ >+ if (config && config.context) { >+ contextName = config.context; >+ } >+ >+ context = getOwn(contexts, contextName); >+ if (!context) { >+ context = contexts[contextName] = req.s.newContext(contextName); >+ } >+ >+ if (config) { >+ context.configure(config); >+ } >+ >+ return context.require(deps, callback, errback); >+ }; >+ >+ /** >+ * Support require.config() to make it easier to cooperate with other >+ * AMD loaders on globally agreed names. >+ */ >+ req.config = function (config) { >+ return req(config); >+ }; >+ >+ /** >+ * Execute something after the current tick >+ * of the event loop. Override for other envs >+ * that have a better solution than setTimeout. >+ * @param {Function} fn function to execute later. >+ */ >+ req.nextTick = typeof setTimeout !== 'undefined' ? function (fn) { >+ setTimeout(fn, 4); >+ } : function (fn) { fn(); }; >+ >+ /** >+ * Export require as a global, but only if it does not already exist. >+ */ >+ if (!require) { >+ require = req; >+ } >+ >+ req.version = version; >+ >+ //Used to filter out dependencies that are already paths. >+ req.jsExtRegExp = /^\/|:|\?|\.js$/; >+ req.isBrowser = isBrowser; >+ s = req.s = { >+ contexts: contexts, >+ newContext: newContext >+ }; >+ >+ //Create default context. >+ req({}); >+ >+ //Exports some context-sensitive methods on global require. >+ each([ >+ 'toUrl', >+ 'undef', >+ 'defined', >+ 'specified' >+ ], function (prop) { >+ //Reference from contexts instead of early binding to default context, >+ //so that during builds, the latest instance of the default context >+ //with its config gets used. >+ req[prop] = function () { >+ var ctx = contexts[defContextName]; >+ return ctx.require[prop].apply(ctx, arguments); >+ }; >+ }); >+ >+ if (isBrowser) { >+ head = s.head = document.getElementsByTagName('head')[0]; >+ //If BASE tag is in play, using appendChild is a problem for IE6. >+ //When that browser dies, this can be removed. Details in this jQuery bug: >+ //http://dev.jquery.com/ticket/2709 >+ baseElement = document.getElementsByTagName('base')[0]; >+ if (baseElement) { >+ head = s.head = baseElement.parentNode; >+ } >+ } >+ >+ /** >+ * Any errors that require explicitly generates will be passed to this >+ * function. Intercept/override it if you want custom error handling. >+ * @param {Error} err the error object. >+ */ >+ req.onError = defaultOnError; >+ >+ /** >+ * Creates the node for the load command. Only used in browser envs. >+ */ >+ req.createNode = function (config, moduleName, url) { >+ var node = config.xhtml ? >+ document.createElementNS('http://www.w3.org/1999/xhtml', 'html:script') : >+ document.createElement('script'); >+ node.type = config.scriptType || 'text/javascript'; >+ node.charset = 'utf-8'; >+ node.async = true; >+ return node; >+ }; >+ >+ /** >+ * Does the request to load a module for the browser case. >+ * Make this a separate function to allow other environments >+ * to override it. >+ * >+ * @param {Object} context the require context to find state. >+ * @param {String} moduleName the name of the module. >+ * @param {Object} url the URL to the module. >+ */ >+ req.load = function (context, moduleName, url) { >+ var config = (context && context.config) || {}, >+ node; >+ if (isBrowser) { >+ //In the browser so use a script tag >+ node = req.createNode(config, moduleName, url); >+ >+ node.setAttribute('data-requirecontext', context.contextName); >+ node.setAttribute('data-requiremodule', moduleName); >+ >+ //Set up load listener. Test attachEvent first because IE9 has >+ //a subtle issue in its addEventListener and script onload firings >+ //that do not match the behavior of all other browsers with >+ //addEventListener support, which fire the onload event for a >+ //script right after the script execution. See: >+ //https://connect.microsoft.com/IE/feedback/details/648057/script-onload-event-is-not-fired-immediately-after-script-execution >+ //UNFORTUNATELY Opera implements attachEvent but does not follow the script >+ //script execution mode. >+ if (node.attachEvent && >+ //Check if node.attachEvent is artificially added by custom script or >+ //natively supported by browser >+ //read https://github.com/jrburke/requirejs/issues/187 >+ //if we can NOT find [native code] then it must NOT natively supported. >+ //in IE8, node.attachEvent does not have toString() >+ //Note the test for "[native code" with no closing brace, see: >+ //https://github.com/jrburke/requirejs/issues/273 >+ !(node.attachEvent.toString && node.attachEvent.toString().indexOf('[native code') < 0) && >+ !isOpera) { >+ //Probably IE. IE (at least 6-8) do not fire >+ //script onload right after executing the script, so >+ //we cannot tie the anonymous define call to a name. >+ //However, IE reports the script as being in 'interactive' >+ //readyState at the time of the define call. >+ useInteractive = true; >+ >+ node.attachEvent('onreadystatechange', context.onScriptLoad); >+ //It would be great to add an error handler here to catch >+ //404s in IE9+. However, onreadystatechange will fire before >+ //the error handler, so that does not help. If addEventListener >+ //is used, then IE will fire error before load, but we cannot >+ //use that pathway given the connect.microsoft.com issue >+ //mentioned above about not doing the 'script execute, >+ //then fire the script load event listener before execute >+ //next script' that other browsers do. >+ //Best hope: IE10 fixes the issues, >+ //and then destroys all installs of IE 6-9. >+ //node.attachEvent('onerror', context.onScriptError); >+ } else { >+ node.addEventListener('load', context.onScriptLoad, false); >+ node.addEventListener('error', context.onScriptError, false); >+ } >+ node.src = url; >+ >+ //For some cache cases in IE 6-8, the script executes before the end >+ //of the appendChild execution, so to tie an anonymous define >+ //call to the module name (which is stored on the node), hold on >+ //to a reference to this node, but clear after the DOM insertion. >+ currentlyAddingScript = node; >+ if (baseElement) { >+ head.insertBefore(node, baseElement); >+ } else { >+ head.appendChild(node); >+ } >+ currentlyAddingScript = null; >+ >+ return node; >+ } else if (isWebWorker) { >+ try { >+ //In a web worker, use importScripts. This is not a very >+ //efficient use of importScripts, importScripts will block until >+ //its script is downloaded and evaluated. However, if web workers >+ //are in play, the expectation that a build has been done so that >+ //only one script needs to be loaded anyway. This may need to be >+ //reevaluated if other use cases become common. >+ importScripts(url); >+ >+ //Account for anonymous modules >+ context.completeLoad(moduleName); >+ } catch (e) { >+ context.onError(makeError('importscripts', >+ 'importScripts failed for ' + >+ moduleName + ' at ' + url, >+ e, >+ [moduleName])); >+ } >+ } >+ }; >+ >+ function getInteractiveScript() { >+ if (interactiveScript && interactiveScript.readyState === 'interactive') { >+ return interactiveScript; >+ } >+ >+ eachReverse(scripts(), function (script) { >+ if (script.readyState === 'interactive') { >+ return (interactiveScript = script); >+ } >+ }); >+ return interactiveScript; >+ } >+ >+ //Look for a data-main script attribute, which could also adjust the baseUrl. >+ if (isBrowser) { >+ //Figure out baseUrl. Get it from the script tag with require.js in it. >+ eachReverse(scripts(), function (script) { >+ //Set the 'head' where we can append children by >+ //using the script's parent. >+ if (!head) { >+ head = script.parentNode; >+ } >+ >+ //Look for a data-main attribute to set main script for the page >+ //to load. If it is there, the path to data main becomes the >+ //baseUrl, if it is not already set. >+ dataMain = script.getAttribute('data-main'); >+ if (dataMain) { >+ //Preserve dataMain in case it is a path (i.e. contains '?') >+ mainScript = dataMain; >+ >+ //Set final baseUrl if there is not already an explicit one. >+ if (!cfg.baseUrl) { >+ //Pull off the directory of data-main for use as the >+ //baseUrl. >+ src = mainScript.split('/'); >+ mainScript = src.pop(); >+ subPath = src.length ? src.join('/') + '/' : './'; >+ >+ cfg.baseUrl = subPath; >+ } >+ >+ //Strip off any trailing .js since mainScript is now >+ //like a module name. >+ mainScript = mainScript.replace(jsSuffixRegExp, ''); >+ >+ //If mainScript is still a path, fall back to dataMain >+ if (req.jsExtRegExp.test(mainScript)) { >+ mainScript = dataMain; >+ } >+ >+ //Put the data-main script in the files to load. >+ cfg.deps = cfg.deps ? cfg.deps.concat(mainScript) : [mainScript]; >+ >+ return true; >+ } >+ }); >+ } >+ >+ /** >+ * The function that handles definitions of modules. Differs from >+ * require() in that a string for the module should be the first argument, >+ * and the function to execute after dependencies are loaded should >+ * return a value to define the module corresponding to the first argument's >+ * name. >+ */ >+ define = function (name, deps, callback) { >+ var node, context; >+ >+ //Allow for anonymous modules >+ if (typeof name !== 'string') { >+ //Adjust args appropriately >+ callback = deps; >+ deps = name; >+ name = null; >+ } >+ >+ //This module may not have dependencies >+ if (!isArray(deps)) { >+ callback = deps; >+ deps = null; >+ } >+ >+ //If no name, and callback is a function, then figure out if it a >+ //CommonJS thing with dependencies. >+ if (!deps && isFunction(callback)) { >+ deps = []; >+ //Remove comments from the callback string, >+ //look for require calls, and pull them into the dependencies, >+ //but only if there are function args. >+ if (callback.length) { >+ callback >+ .toString() >+ .replace(commentRegExp, '') >+ .replace(cjsRequireRegExp, function (match, dep) { >+ deps.push(dep); >+ }); >+ >+ //May be a CommonJS thing even without require calls, but still >+ //could use exports, and module. Avoid doing exports and module >+ //work though if it just needs require. >+ //REQUIRES the function to expect the CommonJS variables in the >+ //order listed below. >+ deps = (callback.length === 1 ? ['require'] : ['require', 'exports', 'module']).concat(deps); >+ } >+ } >+ >+ //If in IE 6-8 and hit an anonymous define() call, do the interactive >+ //work. >+ if (useInteractive) { >+ node = currentlyAddingScript || getInteractiveScript(); >+ if (node) { >+ if (!name) { >+ name = node.getAttribute('data-requiremodule'); >+ } >+ context = contexts[node.getAttribute('data-requirecontext')]; >+ } >+ } >+ >+ //Always save off evaluating the def call until the script onload handler. >+ //This allows multiple modules to be in a file without prematurely >+ //tracing dependencies, and allows for anonymous module support, >+ //where the module name is not known until the script onload event >+ //occurs. If no context, use the global queue, and get it processed >+ //in the onscript load callback. >+ (context ? context.defQueue : globalDefQueue).push([name, deps, callback]); >+ }; >+ >+ define.amd = { >+ jQuery: true >+ }; >+ >+ >+ /** >+ * Executes the text. Normally just uses eval, but can be modified >+ * to use a better, environment-specific call. Only used for transpiling >+ * loader plugins, not for plain JS modules. >+ * @param {String} text the text to execute/evaluate. >+ */ >+ req.exec = function (text) { >+ /*jslint evil: true */ >+ return eval(text); >+ }; >+ >+ //Set up with config info. >+ req(cfg); >+}(this)); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc >index 0e4c279..a5328d3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc >@@ -1,7 +1,7 @@ > <script src="[% interface %]/lib/codemirror/codemirror-compressed.js"></script> > <script src="[% interface %]/lib/filesaver.js"></script> > <script src="[% interface %]/lib/koha/cateditor/marc-mode.js"></script> >-<script src="[% interface %]/lib/require.js"></script> >+<script src="[% interface %]/lib/requirejs/require.js"></script> > <script> > require.config( { > baseUrl: '[% interface %]/lib/koha/cateditor/', >-- >2.1.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 17241
:
55139
|
55140
|
68160
|
68161