oxymoron 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba2cfcac8057d43bfb870dd02aaa0924f6488d8c
-  data.tar.gz: b3b9d2905e004ac1814eedc8d9ecfebc65493001
+  metadata.gz: b8c055cf8d6022a6ef95cde952de2edb6ecd48f4
+  data.tar.gz: 7e247ce65c0af4727f02a9c6bab469dd50d5f6ca
 SHA512:
-  metadata.gz: a7a46692f762bb48385842735922fa99b93ca67d7b1e4e9660328413471edc299587223d0376967bb2e72b3138c3520ea1fa8ab588f7c8f07a737880511c3b24
-  data.tar.gz: 1040515932287e6d02810f0a5e903b485d10fce8183d584369a4a082660113dfe577235c52e88ad9008abbd911c64e155870be020f37a3e5b585c8ba7f5100fb
+  metadata.gz: fcb1a9f0bca79762282e9fbb0968283adf9a830d14d341195019645f2ac6be10a5776dbd996cec52e121d8a881631d535a0e3c4b8d2907ec9270dfe59a082e03
+  data.tar.gz: f1264247051c55b07e171d7bdfded7faa600daebd34c26a959d40843f7509d2a52c6d543e99691b5e3666f7d1360665727ebbc251029d1d7bba488b53f741e80

data/app/assets/javascripts/oxymoron/config/states.js.erb

@@ -45,11 +45,7 @@ angular.module("oxymoron.config.states", [])
             <% unless value[:cache] %>
               params['v']=(new Date()).getTime();
             <% end %>
-            if ($stateProvider.oxymoron_location) {
-              var query = _.omit($stateProvider.oxymoron_location.search(), _.keys(params));
-              params = angular.extend(query, params); 
-            }
-
+            
             return Routes['<%= key %>_path'](params);
           },
           reloadOnSearch: true,

data/app/assets/javascripts/oxymoron/directives.js.erb

@@ -2,4 +2,4 @@
 <%= render_oxymoron_assets "directives/fileupload.js"%>
 <%= render_oxymoron_assets "directives/click_outside.js"%>
 
-angular.module("oxymoron.directives", ['oxymoron.directives.fileupload', 'oxymoron.directives.contentFor', 'oxymoron.directives.checklistModel', 'oxymoron.directives.clickOutside'])
+angular.module("oxymoron.directives", ['oxymoron.directives.fileupload', 'oxymoron.directives.contentFor', 'oxymoron.directives.clickOutside'])

data/app/assets/javascripts/oxymoron/notifier.js.erb

@@ -1,5 +1,5 @@
 angular.module("oxymoron.notifier", [])
-  .run(['$rootScope', 'ngNotify', 'Validate', '$state', '$http', '$location', function ($rootScope, ngNotify, Validate, $state, $http, $location) {
+  .run(['$rootScope', 'ngNotify', 'Validate', '$state', '$http', '$location', 'Notice', function ($rootScope, ngNotify, Validate, $state, $http, $location, Notice) {
     ngNotify.config({
         theme: 'pure',
         position: 'top',
@@ -7,10 +7,10 @@ angular.module("oxymoron.notifier", [])
         type: 'info'
     });
 
-    $rootScope.notify_callback = function(type, res) {
+    var callback = function(type, res) {
       if (res.data && angular.isObject(res.data)) {
         if (res.data.msg || res.data.error) {
-          ngNotify.set(res.data.msg || res.data.error, type);
+          Notice.callback(type, res);
         }
 
         if (res.data.errors) {
@@ -30,11 +30,11 @@ angular.module("oxymoron.notifier", [])
     }
 
     $rootScope.$on('loading:finish', function (h, res) {
-      $rootScope.notify_callback('success', res)
+      callback('success', res)
     })
 
     $rootScope.$on('loading:error', function (h, res, p) {
-      $rootScope.notify_callback('error', res)
+      callback('error', res)
     })
 
 

data/app/assets/javascripts/oxymoron/services/sign.js

@@ -7,28 +7,22 @@ angular.module("oxymoron.services.sign", [])
         .success(function () {
           if (callback)
             callback()
-          else
-            window.location = "/";
         })
     }
 
-    Sign.in = function (user, callback) {
-      $http.post(Routes.user_session_path(), {user: user})
+    Sign.in = function (user_params, callback) {
+      $http.post(Routes.user_session_path(), {user: user_params})
         .success(function () {
           if (callback)
             callback();
-          else
-            window.location.reload();
         })
     }
 
-    Sign.up = function (user, callback) {
-      $http.post(Routes.user_registration_path(), {user: user})
+    Sign.up = function (user_params, callback) {
+      $http.post(Routes.user_registration_path(), {user: user_params})
         .success(function () {
           if (callback)
             callback();
-          else
-            window.location.reload();
         })
     }
   }])

data/app/assets/javascripts/oxymoron/services.js.erb

@@ -2,5 +2,6 @@
 <%= render_oxymoron_assets "services/resources.js.erb"%>
 <%= render_oxymoron_assets "services/sign.js"%>
 <%= render_oxymoron_assets "services/validate.js"%>
+<%= render_oxymoron_assets "services/notice.js"%>
 
-angular.module("oxymoron.services", ["oxymoron.services.interceptor", "oxymoron.services.resources", "oxymoron.services.sign", "oxymoron.services.validate"])
+angular.module("oxymoron.services", ["oxymoron.services.interceptor", "oxymoron.services.notice", "oxymoron.services.resources", "oxymoron.services.sign", "oxymoron.services.validate"])

data/lib/oxymoron/version.rb

@@ -1,3 +1,3 @@
 module Oxymoron
-  VERSION = "1.0.4"
+  VERSION = "1.0.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oxymoron
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Kononenko Paul