Skip to content

Commit

Permalink
Used exact version number for bower and npm modules
Browse files Browse the repository at this point in the history
  • Loading branch information
kazoompa authored and ymarcon committed Apr 24, 2015
1 parent 4f89f8e commit aba4b82
Show file tree
Hide file tree
Showing 171 changed files with 19,579 additions and 35,955 deletions.
26 changes: 13 additions & 13 deletions mica-webapp/bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,34 +3,34 @@
"version": "0.0.1",
"dependencies": {
"angular": "1.2.16",
"angular-animate": "~1.2.16",
"angular-bootstrap": "~0.10.0",
"angular-chosen-localytics": "~1.0.6",
"angular-animate": "1.2.16",
"angular-bootstrap": "0.10.0",
"angular-chosen-localytics": "1.0.6",
"angular-cookies": "1.2.16",
"angular-dynamic-locale": "0.1.1",
"angular-i18n": "1.2.16",
"angular-loading-bar": "~0.4.2",
"angular-loading-bar": "0.4.2",
"angular-resource": "1.2.16",
"angular-route": "1.2.16",
"angular-sanitize": "1.2.16",
"angular-translate": "2.1.0",
"angular-translate-loader-static-files": "2.1.0",
"angular-translate-storage-cookie": "2.1.0",
"angular-ui": "~0.4.0",
"bootstrap": "~3.1.1",
"bootswatch": "~3.1.1+1",
"font-awesome": "~4.0.3",
"grunt-contrib-less": "~0.11.0",
"angular-ui": "0.4.0",
"bootstrap": "3.1.1",
"bootswatch": "3.1.1+1",
"font-awesome": "4.0.3",
"grunt-contrib-less": "0.11.0",
"jquery": "2.0.3",
"jquery-ui": "~1.10.4",
"jquery-ui": "1.10.4",
"json3": "3.3.0",
"mica-study-timeline": "git@github.com:obiba/mica-study-timeline.git",
"ng-file-upload": "~1.4.0",
"ng-file-upload": "1.4.0",
"ng-obiba": "git@github.com:obiba/ng-obiba.git",
"modernizr": "2.7.1",
"swagger-ui": "2.0.16",
"filesize": "~2.0.3",
"angular-utils-pagination": "~0.6.0"
"filesize": "2.0.3",
"angular-utils-pagination": "0.6.1"
},
"devDependencies": {
"angular-mocks": "1.2.16",
Expand Down
10 changes: 5 additions & 5 deletions mica-webapp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
"description": "Description for mica",
"dependencies": {},
"devDependencies": {
"grunt": "^0.4.5",
"grunt": "0.4.5",
"grunt-autoprefixer": "0.7.3",
"grunt-bower-install": "1.6.0",
"grunt-cli": "0.1.13",
"grunt-concurrent": "0.5.0",
"grunt-connect-proxy": "^0.1.10",
"grunt-connect-proxy": "0.1.10",
"grunt-contrib-clean": "0.5.0",
"grunt-contrib-concat": "0.4.0",
"grunt-contrib-connect": "0.7.1",
Expand All @@ -18,10 +18,10 @@
"grunt-contrib-htmlmin": "0.3.0",
"grunt-contrib-imagemin": "0.7.0",
"grunt-contrib-jshint": "0.10.0",
"grunt-contrib-less": "^0.11.0",
"grunt-contrib-less": "0.11.0",
"grunt-contrib-uglify": "0.4.0",
"grunt-contrib-watch": "0.6.1",
"grunt-wiredep": "^2.0.0",
"grunt-wiredep": "2.0.0",
"grunt-karma": "0.8.3",
"grunt-modernizr": "0.5.2",
"grunt-ngmin": "0.0.3",
Expand All @@ -36,7 +36,7 @@
"karma-phantomjs-launcher": "0.1.4",
"karma-requirejs": "0.2.2",
"karma-script-launcher": "0.1.0",
"load-grunt-tasks": "^0.4.0",
"load-grunt-tasks": "0.4.0",
"time-grunt": "0.3.1"
},
"engines": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
"commit": "4eccd8ec8356a33bf3a98958d7a73b71290d3985"
},
"_source": "git://github.com/angular/bower-angular-animate.git",
"_target": "~1.2.16",
"_originalSource": "angular-animate",
"_direct": true
"_target": "1.2.16",
"_originalSource": "angular-animate"
}
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
"commit": "f486d33d6f4c60d905ed0792eacbba2456a32b87"
},
"_source": "git://github.com/angular-ui/bootstrap-bower.git",
"_target": "~0.10.0",
"_originalSource": "angular-bootstrap",
"_direct": true
"_target": "0.10.0",
"_originalSource": "angular-bootstrap"
}
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
"commit": "a1e5959fd5c13f584c8ecb27b1b12bd31bcf479b"
},
"_source": "git://github.com/localytics/angular-chosen.git",
"_target": "~1.0.6",
"_originalSource": "angular-chosen-localytics",
"_direct": true
"_target": "1.0.6",
"_originalSource": "angular-chosen-localytics"
}
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
/* Additional styles to display a spinner image while options are loading */
.localytics-chosen.loading + .chosen-container-multi .chosen-choices {
.localytics-chosen.loading+.chosen-container-multi .chosen-choices {
background-image: url('spinner.gif');
background-repeat: no-repeat;
background-position: 95%;
}

.localytics-chosen.loading + .chosen-container-single .chosen-single span {
.localytics-chosen.loading+.chosen-container-single .chosen-single span {
background: url('spinner.gif') no-repeat right;
}

.localytics-chosen.loading + .chosen-container-single .chosen-single .search-choice-close {
.localytics-chosen.loading+.chosen-container-single .chosen-single .search-choice-close {
display: none;
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module.exports = function (grunt) {
module.exports = function(grunt) {
//grunt plugins
grunt.loadNpmTasks('grunt-contrib-clean');
grunt.loadNpmTasks('grunt-contrib-copy');
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

autoWatch = false;
singleRun = true;
logLevel = LOG_INFO;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use strict';

angular.module('tmh.dynamicLocale', []).provider('tmhDynamicLocale', function () {
angular.module('tmh.dynamicLocale', []).provider('tmhDynamicLocale', function() {

var localeLocationPattern = 'angular/i18n/angular-locale_{{locale}}.js',
storageFactory = 'tmhDynamicLocaleStorageCache',
Expand All @@ -20,7 +20,7 @@ angular.module('tmh.dynamicLocale', []).provider('tmhDynamicLocale', function ()
if (script.readyState) { // IE
script.onreadystatechange = function () {
if (script.readyState === 'loaded' ||
script.readyState === 'complete') {
script.readyState === 'complete') {
script.onreadystatechange = null;
callback();
}
Expand All @@ -44,20 +44,20 @@ angular.module('tmh.dynamicLocale', []).provider('tmhDynamicLocale', function ()
function loadLocale(localeUrl, $locale, localeId, $rootScope, $q, localeCache, storage) {

function overrideValues(oldObject, newObject) {
angular.forEach(newObject, function (value, key) {
angular.forEach(newObject, function(value, key) {
if (angular.isArray(newObject[key]) || angular.isObject(newObject[key])) {
overrideValues(oldObject[key], newObject[key]);
} else {
} else {
oldObject[key] = newObject[key];
}
}
});
}
}


var cachedLocale = localeCache.get(localeId),
deferred = $q.defer();
if (cachedLocale) {
$rootScope.$evalAsync(function () {
$rootScope.$evalAsync(function() {
overrideValues($locale, cachedLocale);
$rootScope.$broadcast('$localeChangeSuccess', localeId, $locale);
storage.put(storeKey, localeId);
Expand All @@ -82,7 +82,7 @@ angular.module('tmh.dynamicLocale', []).provider('tmhDynamicLocale', function ()
return deferred.promise;
}

this.localeLocationPattern = function (value) {
this.localeLocationPattern = function(value) {
if (value) {
localeLocationPattern = value;
return this;
Expand All @@ -91,15 +91,15 @@ angular.module('tmh.dynamicLocale', []).provider('tmhDynamicLocale', function ()
}
};

this.useStorage = function (storageName) {
this.useStorage = function(storageName) {
storageFactory = storageName;
};

this.useCookieStorage = function () {
this.useCookieStorage = function() {
this.useStorage('$cookieStore');
};

this.$get = ['$rootScope', '$injector', '$interpolate', '$locale', '$q', 'tmhDynamicLocaleCache', function ($rootScope, $injector, interpolate, locale, $q, tmhDynamicLocaleCache) {
this.$get = ['$rootScope', '$injector', '$interpolate', '$locale', '$q', 'tmhDynamicLocaleCache', function($rootScope, $injector, interpolate, locale, $q, tmhDynamicLocaleCache) {
var localeLocation = interpolate(localeLocationPattern),
storage = $injector.get(storageFactory),
initialLocale;
Expand All @@ -116,18 +116,18 @@ angular.module('tmh.dynamicLocale', []).provider('tmhDynamicLocale', function ()
* a background task that will retrieve the new locale and configure the current $locale
* instance with the information from the new locale
*/
set: function (value) {
set: function(value) {
return loadLocale(localeLocation({locale: value}), locale, value, $rootScope, $q, tmhDynamicLocaleCache, storage);
}
};
}];

}).provider('tmhDynamicLocaleCache', function () {
this.$get = ['$cacheFactory', function ($cacheFactory) {
}).provider('tmhDynamicLocaleCache', function() {
this.$get = ['$cacheFactory', function($cacheFactory) {
return $cacheFactory('tmh.dynamicLocales');
}];
}).provider('tmhDynamicLocaleStorageCache', function () {
this.$get = ['$cacheFactory', function ($cacheFactory) {
}).provider('tmhDynamicLocaleStorageCache', function() {
this.$get = ['$cacheFactory', function($cacheFactory) {
return $cacheFactory('tmh.dynamicLocales.store');
}];
});
Loading

0 comments on commit aba4b82

Please sign in to comment.