From 71c7b16485ef6b46645097ee8c2a6d7e3423ced2 Mon Sep 17 00:00:00 2001 From: Oleksii Rudenko Date: Wed, 6 May 2015 12:52:51 +0200 Subject: [PATCH] v1.12.0-beta.3 --- README.md | 4 +-- app/components/my-component.js | 11 ++++--- app/config.js | 28 ++++++++-------- dist/app.js | 58 +++++++++++++--------------------- gulpfile.js | 31 ++++++++++++++++-- package.json | 21 ++++++++---- 6 files changed, 89 insertions(+), 64 deletions(-) diff --git a/README.md b/README.md index 064ca0e..e2dccbb 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ FEATURES }); ``` - - Uses [Ember Computed Decorators](https://github.com/rwjblue/ember-computed-decorators) + - [Disabled at the moment due to bugs in the dependencies.] Uses [Ember Computed Decorators](https://github.com/rwjblue/ember-computed-decorators) ```javascript var MyComponent = Ember.Component.extend({ @@ -46,7 +46,7 @@ FEATURES Packages Info ============= -Ember version: 1.12.0-beta.1 +Ember version: 1.12.0-beta.3 JSPM: 0.15.3 diff --git a/app/components/my-component.js b/app/components/my-component.js index 3b103e8..4fa5735 100644 --- a/app/components/my-component.js +++ b/app/components/my-component.js @@ -8,11 +8,14 @@ var MyComponent = Ember.Component.extend({ key: 'my-key', - @computed('key') - test(key) { - return `${key} + computed`; - } + // @computed('key') + // test(key) { + // return `${key} + computed`; + // } + test: Ember.computed('key', function() { + return `${this.get('key')} + computed`; + }) }); Ember.Handlebars.helper('my-component', MyComponent); diff --git a/app/config.js b/app/config.js index b4a8fa8..f7f7cf7 100644 --- a/app/config.js +++ b/app/config.js @@ -15,36 +15,36 @@ System.config({ System.config({ "map": { - "babel": "npm:babel-core@5.1.13", - "babel-runtime": "npm:babel-runtime@5.1.13", - "core-js": "npm:core-js@0.9.4", - "ember": "github:components/ember@1.12.0-beta.1", + "babel": "npm:babel-core@5.2.15", + "babel-runtime": "npm:babel-runtime@5.2.15", + "core-js": "npm:core-js@0.9.6", + "ember": "github:components/ember@1.12.0-beta.3", "ember-computed-decorators": "github:rwjblue/ember-computed-decorators@master", - "hbs": "github:n-fuse/plugin-ember-hbs@1.12.0-beta.1", - "ihbs": "github:n-fuse/plugin-ember-ihbs@1.12.0-beta.1", + "hbs": "github:n-fuse/plugin-ember-hbs@1.12.0-beta.3", + "ihbs": "github:n-fuse/plugin-ember-ihbs@1.12.0-beta.3", "jquery": "github:components/jquery@2.1.3", "n-fuse/pajax": "github:n-fuse/pajax@0.1.7", "pajax": "github:n-fuse/pajax@0.1.7", - "github:components/ember@1.12.0-beta.1": { + "github:components/ember@1.12.0-beta.3": { "jquery": "github:components/jquery@2.1.3" }, "github:jspm/nodelibs-process@0.1.1": { "process": "npm:process@0.10.1" }, - "github:n-fuse/plugin-ember-hbs@1.12.0-beta.1": { - "ember-template-compiler": "github:n-fuse/ember-template-compiler@1.12.0-beta.1" + "github:n-fuse/plugin-ember-hbs@1.12.0-beta.3": { + "ember-template-compiler": "github:n-fuse/ember-template-compiler@1.12.0-beta.3" }, - "github:n-fuse/plugin-ember-ihbs@1.12.0-beta.1": { - "ember-template-compiler": "github:n-fuse/ember-template-compiler@1.12.0-beta.1" + "github:n-fuse/plugin-ember-ihbs@1.12.0-beta.3": { + "ember-template-compiler": "github:n-fuse/ember-template-compiler@1.12.0-beta.3" }, "github:rwjblue/ember-computed-decorators@master": { - "ember": "github:components/ember@1.12.0-beta.1", + "ember": "github:components/ember@1.12.0-beta.3", "ember-new-computed": "github:rwjblue/ember-new-computed@master" }, "github:rwjblue/ember-new-computed@master": { - "ember": "github:components/ember@1.12.0-beta.1" + "ember": "github:components/ember@1.12.0-beta.3" }, - "npm:core-js@0.9.4": { + "npm:core-js@0.9.6": { "process": "github:jspm/nodelibs-process@0.1.1" } } diff --git a/dist/app.js b/dist/app.js index 771bf85..04043d6 100644 --- a/dist/app.js +++ b/dist/app.js @@ -1,40 +1,26 @@ !function(global){function dedupe(deps){for(var newDeps=[],i=0,l=deps.length;l>i;i++)-1==indexOf.call(newDeps,deps[i])&&newDeps.push(deps[i]);return newDeps}function register(name,deps,declare,execute){if("string"!=typeof name)throw"System.register provided no module name";var entry;entry="boolean"==typeof declare?{declarative:!1,deps:deps,execute:execute,executingRequire:declare}:{declarative:!0,deps:deps,declare:declare},entry.name=name,name in defined||(defined[name]=entry),entry.deps=dedupe(entry.deps),entry.normalizedDeps=entry.deps}function buildGroups(entry,groups){if(groups[entry.groupIndex]=groups[entry.groupIndex]||[],-1==indexOf.call(groups[entry.groupIndex],entry)){groups[entry.groupIndex].push(entry);for(var i=0,l=entry.normalizedDeps.length;l>i;i++){var depName=entry.normalizedDeps[i],depEntry=defined[depName];if(depEntry&&!depEntry.evaluated){var depGroupIndex=entry.groupIndex+(depEntry.declarative!=entry.declarative);if(void 0===depEntry.groupIndex||depEntry.groupIndex=0;i--){for(var group=groups[i],j=0;ji;i++){var importerModule=module.importers[i];if(!importerModule.locked){var importerIndex=indexOf.call(importerModule.dependencies,module);importerModule.setters[importerIndex](exports)}}return module.locked=!1,value});if(module.setters=declaration.setters,module.execute=declaration.execute,!module.setters||!module.execute)throw new TypeError("Invalid System.register form for "+entry.name);for(var i=0,l=entry.normalizedDeps.length;l>i;i++){var depExports,depName=entry.normalizedDeps[i],depEntry=defined[depName],depModule=moduleRecords[depName];depModule?depExports=depModule.exports:depEntry&&!depEntry.declarative?depExports=depEntry.module.exports&&depEntry.module.exports.__esModule?depEntry.module.exports:{"default":depEntry.module.exports,__useDefault:!0}:depEntry?(linkDeclarativeModule(depEntry),depModule=depEntry.module,depExports=depModule.exports):depExports=load(depName),depModule&&depModule.importers?(depModule.importers.push(module),module.dependencies.push(depModule)):module.dependencies.push(null),module.setters[i]&&module.setters[i](depExports)}}}function getModule(name){var exports,entry=defined[name];if(entry)entry.declarative?ensureEvaluated(name,[]):entry.evaluated||linkDynamicModule(entry),exports=entry.module.exports;else if(exports=load(name),!exports)throw new Error("Unable to load dependency "+name+".");return(!entry||entry.declarative)&&exports&&exports.__useDefault?exports["default"]:exports}function linkDynamicModule(entry){if(!entry.module){var exports={},module=entry.module={exports:exports,id:entry.name};if(!entry.executingRequire)for(var i=0,l=entry.normalizedDeps.length;l>i;i++){var depName=entry.normalizedDeps[i],depEntry=defined[depName];depEntry&&linkDynamicModule(depEntry)}entry.evaluated=!0;var output=entry.execute.call(global,function(name){for(var i=0,l=entry.deps.length;l>i;i++)if(entry.deps[i]==name)return getModule(entry.normalizedDeps[i]);throw new TypeError("Module "+name+" not declared as a dependency.")},exports,module);output&&(module.exports=output)}}function ensureEvaluated(moduleName,seen){var entry=defined[moduleName];if(entry&&!entry.evaluated&&entry.declarative){seen.push(moduleName);for(var i=0,l=entry.normalizedDeps.length;l>i;i++){var depName=entry.normalizedDeps[i];-1==indexOf.call(seen,depName)&&(defined[depName]?ensureEvaluated(depName,seen):load(depName))}entry.evaluated||(entry.evaluated=!0,entry.module.execute.call(global))}}function load(name){if(modules[name])return modules[name];var entry=defined[name];if(!entry)throw"Module "+name+" not present.";link(name),ensureEvaluated(name,[]),defined[name]=void 0;var module=entry.module.exports;return(!module||!entry.declarative&&module.__esModule!==!0)&&(module={"default":module,__useDefault:!0}),modules[name]=module}var defined={},indexOf=Array.prototype.indexOf||function(item){for(var i=0,l=this.length;l>i;i++)if(this[i]===item)return i;return-1},moduleRecords={},modules={};return function(mains,declare){var System,System={register:register,get:load,set:function(name,module){modules[name]=module},newModule:function(module){return module},global:global};System.set("@empty",{}),declare(System);for(var i=0;i0&&length-1 in obj}function winnow(elements,qualifier,not){if(jQuery.isFunction(qualifier))return jQuery.grep(elements,function(elem,i){return!!qualifier.call(elem,i,elem)!==not});if(qualifier.nodeType)return jQuery.grep(elements,function(elem){return elem===qualifier!==not});if("string"==typeof qualifier){if(risSimple.test(qualifier))return jQuery.filter(qualifier,elements,not);qualifier=jQuery.filter(qualifier,elements)}return jQuery.grep(elements,function(elem){return indexOf.call(qualifier,elem)>=0!==not})}function sibling(cur,dir){for(;(cur=cur[dir])&&1!==cur.nodeType;);return cur}function createOptions(options){var object=optionsCache[options]={};return jQuery.each(options.match(rnotwhite)||[],function(_,flag){object[flag]=!0}),object}function completed(){document.removeEventListener("DOMContentLoaded",completed,!1),window.removeEventListener("load",completed,!1),jQuery.ready()}function Data(){Object.defineProperty(this.cache={},0,{get:function(){return{}}}),this.expando=jQuery.expando+Data.uid++}function dataAttr(elem,key,data){var name;if(void 0===data&&1===elem.nodeType)if(name="data-"+key.replace(rmultiDash,"-$1").toLowerCase(),data=elem.getAttribute(name),"string"==typeof data){try{data="true"===data?!0:"false"===data?!1:"null"===data?null:+data+""===data?+data:rbrace.test(data)?jQuery.parseJSON(data):data}catch(e){}data_user.set(elem,key,data)}else data=void 0;return data}function returnTrue(){return!0}function returnFalse(){return!1}function safeActiveElement(){try{return document.activeElement}catch(err){}}function manipulationTarget(elem,content){return jQuery.nodeName(elem,"table")&&jQuery.nodeName(11!==content.nodeType?content:content.firstChild,"tr")?elem.getElementsByTagName("tbody")[0]||elem.appendChild(elem.ownerDocument.createElement("tbody")):elem}function disableScript(elem){return elem.type=(null!==elem.getAttribute("type"))+"/"+elem.type,elem}function restoreScript(elem){var match=rscriptTypeMasked.exec(elem.type);return match?elem.type=match[1]:elem.removeAttribute("type"),elem}function setGlobalEval(elems,refElements){for(var i=0,l=elems.length;l>i;i++)data_priv.set(elems[i],"globalEval",!refElements||data_priv.get(refElements[i],"globalEval"))}function cloneCopyEvent(src,dest){var i,l,type,pdataOld,pdataCur,udataOld,udataCur,events;if(1===dest.nodeType){if(data_priv.hasData(src)&&(pdataOld=data_priv.access(src),pdataCur=data_priv.set(dest,pdataOld),events=pdataOld.events)){delete pdataCur.handle,pdataCur.events={};for(type in events)for(i=0,l=events[type].length;l>i;i++)jQuery.event.add(dest,type,events[type][i])}data_user.hasData(src)&&(udataOld=data_user.access(src),udataCur=jQuery.extend({},udataOld),data_user.set(dest,udataCur))}}function getAll(context,tag){var ret=context.getElementsByTagName?context.getElementsByTagName(tag||"*"):context.querySelectorAll?context.querySelectorAll(tag||"*"):[];return void 0===tag||tag&&jQuery.nodeName(context,tag)?jQuery.merge([context],ret):ret}function fixInput(src,dest){var nodeName=dest.nodeName.toLowerCase();"input"===nodeName&&rcheckableType.test(src.type)?dest.checked=src.checked:("input"===nodeName||"textarea"===nodeName)&&(dest.defaultValue=src.defaultValue)}function actualDisplay(name,doc){var style,elem=jQuery(doc.createElement(name)).appendTo(doc.body),display=window.getDefaultComputedStyle&&(style=window.getDefaultComputedStyle(elem[0]))?style.display:jQuery.css(elem[0],"display");return elem.detach(),display}function defaultDisplay(nodeName){var doc=document,display=elemdisplay[nodeName];return display||(display=actualDisplay(nodeName,doc),"none"!==display&&display||(iframe=(iframe||jQuery("